diff options
| author | Julie Qiu <julie@golang.org> | 2021-06-18 10:58:17 -1000 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-06-18 22:57:06 +0000 |
| commit | b2a7529a5c1f7c94a80dc63bb24e012a1955645f (patch) | |
| tree | 6e0c5be4680e971d1344f07f0368c2d3353beba8 /devtools/docker/docker-compose.yaml | |
| parent | 18c275ae89dbbe6e87bd2491420a5f5090c8b866 (diff) | |
| download | go-x-pkgsite-b2a7529a5c1f7c94a80dc63bb24e012a1955645f.tar.xz | |
devtools/docker: allow custom GO_DISCOVERY_* values in docker-compose
All GO_DISCOVERY_* can now be customized using environment variables.
Change-Id: I68f7b4e09c4caec7690fca64b8a38237b983bf0d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/329499
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools/docker/docker-compose.yaml')
| -rw-r--r-- | devtools/docker/docker-compose.yaml | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/devtools/docker/docker-compose.yaml b/devtools/docker/docker-compose.yaml index 67395822..b367ee77 100644 --- a/devtools/docker/docker-compose.yaml +++ b/devtools/docker/docker-compose.yaml @@ -19,11 +19,11 @@ services: # This should match the version we are using on AppEngine. image: golang:1.15.5 environment: - - GO_DISCOVERY_TESTDB=true - - GO_DISCOVERY_DATABASE_PORT=5432 - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_USER=postgres - - GO_DISCOVERY_DATABASE_PASSWORD=postgres + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} + - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} + - GO_DISCOVERY_TESTDB=${GO_DISCOVERY_TESTDB:-true} - GOMODCACHE=/gomodcache # TERM is set to xterm-256color for use by devtools/lib.sh. - TERM=xterm-256color @@ -64,11 +64,11 @@ 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_LOG_LEVEL=info + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} + - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} + - GO_DISCOVERY_LOG_LEVEL=${GO_DISCOVERY_LOG_LEVEL:-info} - GOMODCACHE=/gomodcache - WAITFORIT_TIMEOUT=300 - PORT=8080 @@ -90,11 +90,11 @@ 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_LOG_LEVEL=info + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} + - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} + - GO_DISCOVERY_LOG_LEVEL=${GO_DISCOVERY_LOG_LEVEL:-info} - GOMODCACHE=/gomodcache - WAITFORIT_TIMEOUT=300 - PORT=8080 @@ -107,15 +107,13 @@ 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/$GO_DISCOVERY_DATABASE_NAME?sslmode=disable up" + -database postgres://postgres:postgres@db:5432/${GO_DISCOVERY_DATABASE_NAME:-'discovery-db'}?sslmode=disable up" environment: - WAITFORIT_TIMEOUT=300 volumes: @@ -125,9 +123,9 @@ services: image: postgres:11.12 environment: - LANG=C - - POSTGRES_PASSWORD=postgres - - POSTGRES_USER=postgres - - POSTGRES_DB=${GO_DISCOVERY_DATABASE_NAME} + - POSTGRES_DB=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - POSTGRES_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} + - POSTGRES_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} ports: - ${GO_DISCOVERY_DATABASE_PORT:-5432}:5432 nodejs: |