Skip to content

Commit

Permalink
refactor: switch to LOGGER_POSTGRES_URI (#1220)
Browse files Browse the repository at this point in the history
  • Loading branch information
chesedo authored Sep 11, 2023
1 parent ef47eae commit d94a7ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ CARGO_PROFILE?=debug
RUST_LOG?=shuttle=debug,info
DEV_SUFFIX=-dev
DEPLOYS_API_KEY?=gateway4deployes

# this should use the same version as our prod RDS database
LOGGER_POSTGRES_TAG?=15
LOGGER_POSTGRES_PASSWORD?=postgres
LOGGER_POSTGRES_URI?=postgres://postgres:${LOGGER_POSTGRES_PASSWORD}@logger-postgres:5432/postgres
endif

ifeq ($(CI),true)
Expand All @@ -80,11 +85,6 @@ endif
POSTGRES_EXTRA_PATH?=./extras/postgres
POSTGRES_TAG?=14

# this should use the same version as our prod RDS database
LOGGER_POSTGRES_TAG?=15
LOGGER_POSTGRES_HOST?=logger-postgres
LOGGER_POSTGRES_PASSWORD?=postgres

PANAMAX_EXTRA_PATH?=./extras/panamax
PANAMAX_TAG?=1.0.12

Expand Down Expand Up @@ -114,7 +114,7 @@ DOCKER_COMPOSE_ENV=\
POSTGRES_TAG=${POSTGRES_TAG}\
LOGGER_POSTGRES_TAG=${LOGGER_POSTGRES_TAG}\
LOGGER_POSTGRES_PASSWORD=${LOGGER_POSTGRES_PASSWORD}\
LOGGER_POSTGRES_HOST=${LOGGER_POSTGRES_HOST}\
LOGGER_POSTGRES_URI=${LOGGER_POSTGRES_URI}\
PANAMAX_TAG=${PANAMAX_TAG}\
OTEL_TAG=${OTEL_TAG}\
APPS_FQDN=$(APPS_FQDN)\
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,9 @@ services:
default:
environment:
- RUST_LOG=${RUST_LOG}
- LOGGER_POSTGRES_HOST=${LOGGER_POSTGRES_HOST}
- LOGGER_POSTGRES_PASSWORD=${LOGGER_POSTGRES_PASSWORD}
command:
- "--address=0.0.0.0:8000"
- "--db-connection-uri=postgres://postgres:${LOGGER_POSTGRES_PASSWORD}@${LOGGER_POSTGRES_HOST}:5432/postgres"
- "--db-connection-uri=${LOGGER_POSTGRES_URI}"
- "--auth-uri=http://auth:8000"
provisioner:
image: "${CONTAINER_REGISTRY}/provisioner:${PROVISIONER_TAG}"
Expand Down

0 comments on commit d94a7ee

Please sign in to comment.