diff options
| author | Julie Qiu <julie@golang.org> | 2021-06-18 07:50:01 -1000 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-06-18 21:48:44 +0000 |
| commit | cb05da12ecc66c47c4b2beb7531a5028bac84c67 (patch) | |
| tree | 8696c51d05a577c1bd626063834b600301b4b0cc /devtools | |
| parent | 50a62781fd079c62bad8ccf14db1abbad57b1fce (diff) | |
| download | go-x-pkgsite-cb05da12ecc66c47c4b2beb7531a5028bac84c67.tar.xz | |
devtools/{ci,docker}: allow custom database name
Instead of hardcoding the DB name, set it using
GO_DISCOVERY_DATABASE_NAME.
Change-Id: Icce23faadebeb62759391c468cbfdd78b9a7453d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/329492
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Diffstat (limited to 'devtools')
| -rwxr-xr-x | devtools/ci/ci.sh | 2 | ||||
| -rw-r--r-- | devtools/docker/docker-compose.yaml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/devtools/ci/ci.sh b/devtools/ci/ci.sh index eb0ae5ca..c91d7b9d 100755 --- a/devtools/ci/ci.sh +++ b/devtools/ci/ci.sh @@ -19,6 +19,8 @@ export CI=true # Skip installing chrome with puppeteer. We are using the browserless/chrome # docker image instead. export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true +# Set the database name to be used in docker-compose. +export GO_DISCOVERY_DATABASE_NAME=discovery_ci_test # starttime is the start time for this entire script. starttime=`date +%s` diff --git a/devtools/docker/docker-compose.yaml b/devtools/docker/docker-compose.yaml index 6b8d108e..98fc27a5 100644 --- a/devtools/docker/docker-compose.yaml +++ b/devtools/docker/docker-compose.yaml @@ -64,10 +64,10 @@ services: ./third_party/wait-for-it/wait-for-it.sh db:5432 -- go run ./cmd/frontend -host=0.0.0.0:8080" environment: + - GO_DISCOVERY_DATABASE_NAME - GO_DISCOVERY_DATABASE_USER=postgres - GO_DISCOVERY_DATABASE_PASSWORD=postgres - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_NAME=discovery_e2e_test - GO_DISCOVERY_LOG_LEVEL=info - GOMODCACHE=/gomodcache - WAITFORIT_TIMEOUT=300 @@ -90,10 +90,10 @@ services: ./third_party/wait-for-it/wait-for-it.sh db:5432 -- go run ./devtools/cmd/seeddb/seeddb/main.go" environment: + - GO_DISCOVERY_DATABASE_NAME - GO_DISCOVERY_DATABASE_USER=postgres - GO_DISCOVERY_DATABASE_PASSWORD=postgres - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_NAME=discovery_e2e_test - GO_DISCOVERY_LOG_LEVEL=info - GOMODCACHE=/gomodcache - WAITFORIT_TIMEOUT=300 @@ -107,13 +107,15 @@ services: migrate: depends_on: - db + environment: + - GO_DISCOVERY_DATABASE_NAME image: migrate/migrate:v4.14.1 entrypoint: "" command: sh -c " apk add --no-cache bash && ./third_party/wait-for-it/wait-for-it.sh db:5432 -- migrate -path /pkgsite/migrations - -database postgres://postgres:postgres@db:5432/discovery_e2e_test?sslmode=disable up" + -database postgres://postgres:postgres@db:5432/$GO_DISCOVERY_DATABASE_NAME?sslmode=disable up" environment: - WAITFORIT_TIMEOUT=300 volumes: @@ -125,7 +127,7 @@ services: - LANG=C - POSTGRES_PASSWORD=postgres - POSTGRES_USER=postgres - - POSTGRES_DB=discovery_e2e_test + - POSTGRES_DB=${GO_DISCOVERY_DATABASE_NAME} ports: - ${GO_DISCOVERY_DATABASE_PORT:-5432}:5432 nodejs: |