diff --git a/code/server/docker-compose.yml b/code/server/docker-compose.yml index 029be30..8ca6a49 100644 --- a/code/server/docker-compose.yml +++ b/code/server/docker-compose.yml @@ -1,14 +1,13 @@ version: 'latest' - services: postgres-db: container_name: notespace-postgres-db build: context: . - dockerfile: Dockerfile + dockerfile: ./docker/Dockerfile-db environment: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} ports: - - "5432:5432" \ No newline at end of file + - 5432:5432 diff --git a/code/server/docker/Dockerfile-db b/code/server/docker/Dockerfile-db index b19c50f..317fb46 100644 --- a/code/server/docker/Dockerfile-db +++ b/code/server/docker/Dockerfile-db @@ -1,8 +1,15 @@ FROM postgres +USER postgres +WORKDIR /app + +ENV POSTGRES_USER=admin +ENV POSTGRES_PASSWORD=notespace +ENV POSTGRES_DB=notespace + COPY sql/create_tables.sql /docker-entrypoint-initdb.d/1_create-schema.sql -COPY --chown=postgres:postgres ./docker/scripts/wait-for-postgres.sh /usr/local/bin/wait-for-postgres.sh -RUN chmod +x /usr/local/bin/wait-for-postgres.sh +COPY --chown=postgres:postgres ./docker/scripts/wait-for-postgres.sh ./bin/wait-for-postgres.sh +RUN chmod +x ./bin/wait-for-postgres.sh -EXPOSE 5432 +EXPOSE 5432 \ No newline at end of file diff --git a/code/server/render.yaml b/code/server/render.yaml index 98e1341..8d22dd4 100644 --- a/code/server/render.yaml +++ b/code/server/render.yaml @@ -1,6 +1,6 @@ services: - name: postgres-db - type: worker + type: web env: docker plan: standard dockerCommand: docker-compose up