From c9fbfc7e193b85c4ecfcc61a8a71d7bf0a2ceb46 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 4 Nov 2024 15:17:47 +0100 Subject: [PATCH 1/2] build(docker/database): fix postgres file paths --- docker/postgres/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index 75714c7a3..c3a14c0b9 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -3,7 +3,7 @@ FROM docker.io/postgres:12 # Allow for connecting to database without password authentication ENV POSTGRES_HOST_AUTH_METHOD=trust -COPY --chown=postgres:postgres docker/database/pg_hba.conf /tmp/pg_hba.conf -COPY --chown=postgres:postgres docker/database/postgresql.conf /tmp/postgresql.conf -COPY docker/database/pgconfig.sh /docker-entrypoint-initdb.d/_pgconfig.sh -COPY --chown=postgres:postgres docker/database/schema.sql /docker-entrypoint-initdb.d/schema.sql +COPY --chown=postgres:postgres docker/postgres/pg_hba.conf /tmp/pg_hba.conf +COPY --chown=postgres:postgres docker/postgres/postgresql.conf /tmp/postgresql.conf +COPY docker/postgres/pgconfig.sh /docker-entrypoint-initdb.d/_pgconfig.sh +COPY --chown=postgres:postgres docker/postgres/schema.sql /docker-entrypoint-initdb.d/schema.sql From b89ed41b5b70447407f3051d72f0f18a13a3be86 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 4 Nov 2024 15:18:17 +0100 Subject: [PATCH 2/2] build(Makefile): add missing SERVICE_VARIANT def --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3b4f56ffa..65539d931 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,7 @@ start: start-postgres start-memcached start-minio start-frontend start-backend; .PHONY: %-frontend %-frontend: SERVICE=frontend +%-backend: SERVICE_VARIANT=frontend %-frontend: CONTAINER_CMD=localhost/fradrive/frontend .PHONY: %-postgres