From cb7b2db25d77de749008bfc4b28f3062e8a6503c Mon Sep 17 00:00:00 2001 From: Ricardo Costa Date: Tue, 9 Jul 2024 10:50:06 +0100 Subject: [PATCH] Minor Changes --- code/server/docker-compose.yml | 6 +++--- code/server/docker/Dockerfile-db | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/server/docker-compose.yml b/code/server/docker-compose.yml index 77431bf..8ca6a49 100644 --- a/code/server/docker-compose.yml +++ b/code/server/docker-compose.yml @@ -6,8 +6,8 @@ services: context: . dockerfile: ./docker/Dockerfile-db environment: - - POSTGRES_USER=admin - - POSTGRES_PASSWORD=notespace - - POSTGRES_DB=notespace + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DB} ports: - 5432:5432 diff --git a/code/server/docker/Dockerfile-db b/code/server/docker/Dockerfile-db index 512ad14..47e1ce5 100644 --- a/code/server/docker/Dockerfile-db +++ b/code/server/docker/Dockerfile-db @@ -3,6 +3,10 @@ FROM postgres USER postgres WORKDIR /app +ENV POSTGRES_USER=${POSTGRES_USER} +ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD} +ENV POSTGRES_DB=${POSTGRES_DB} + COPY sql/create_tables.sql /docker-entrypoint-initdb.d/1_create-schema.sql COPY --chown=postgres:postgres ./docker/scripts/wait-for-postgres.sh ./bin/wait-for-postgres.sh