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"`.
Trust: Julie Qiu
Run-TryBot: Julie Qiu
TryBot-Result: kokoro
@@ -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:
