diff options
| author | Julie Qiu <julie@golang.org> | 2021-07-07 22:09:18 -0700 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-07-12 18:32:39 +0000 |
| commit | 68b0a9870c85912dcb75e569a22d50bb8a3781ac (patch) | |
| tree | 1221108a5f01014804c1049bd45e1fcbbcad0ce3 /devtools | |
| parent | eb9dcb8e406696220b24af1842827d7fd992f5b7 (diff) | |
| download | go-x-pkgsite-68b0a9870c85912dcb75e569a22d50bb8a3781ac.tar.xz | |
devtools/docker: remove quotes around db name
The quotes around "discovery-db" were unnecessary, and the database name
was sometimes being created as `"discovery-db"`.
Change-Id: I826e91c6b787e5b0cee465adb6f0e4acd105a85d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/333372
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')
| -rw-r--r-- | devtools/docker/docker-compose.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/devtools/docker/docker-compose.yaml b/devtools/docker/docker-compose.yaml index e63d071e..e94be263 100644 --- a/devtools/docker/docker-compose.yaml +++ b/devtools/docker/docker-compose.yaml @@ -20,7 +20,7 @@ services: image: golang:1.15.5 environment: - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-discovery-db} - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} - GO_DISCOVERY_TESTDB=${GO_DISCOVERY_TESTDB:-true} @@ -57,7 +57,7 @@ services: go run ./cmd/frontend -host=0.0.0.0:8080" environment: - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-discovery-db} - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} - GO_DISCOVERY_LOG_LEVEL=${GO_DISCOVERY_LOG_LEVEL:-info} @@ -81,7 +81,7 @@ services: go run ./devtools/cmd/seeddb/main.go" environment: - GO_DISCOVERY_DATABASE_HOST=db - - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - GO_DISCOVERY_DATABASE_NAME=${GO_DISCOVERY_DATABASE_NAME:-discovery-db} - GO_DISCOVERY_DATABASE_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} - GO_DISCOVERY_DATABASE_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} - GO_DISCOVERY_LOG_LEVEL=${GO_DISCOVERY_LOG_LEVEL:-info} @@ -101,7 +101,7 @@ services: apk add --no-cache bash && ./third_party/wait-for-it/wait-for-it.sh db:5432 -- migrate -path /pkgsite/migrations - -database postgres://${GO_DISCOVERY_DATABASE_USER:-postgres}:${GO_DISCOVERY_DATABASE_PASSWORD:-postgres}@db:5432/${GO_DISCOVERY_DATABASE_NAME:-'discovery-db'}?sslmode=disable up" + -database postgres://${GO_DISCOVERY_DATABASE_USER:-postgres}:${GO_DISCOVERY_DATABASE_PASSWORD:-postgres}@db:5432/${GO_DISCOVERY_DATABASE_NAME:-discovery-db}?sslmode=disable up" environment: - WAITFORIT_TIMEOUT=300 volumes: @@ -113,7 +113,7 @@ services: - LANG=C # GO_DISCOVERY_DATABASE* variables are set so that this docker file can # be used for local development. - - POSTGRES_DB=${GO_DISCOVERY_DATABASE_NAME:-"discovery-db"} + - POSTGRES_DB=${GO_DISCOVERY_DATABASE_NAME:-discovery-db} - POSTGRES_PASSWORD=${GO_DISCOVERY_DATABASE_PASSWORD:-postgres} - POSTGRES_USER=${GO_DISCOVERY_DATABASE_USER:-postgres} ports: |