feat(database): configurable pgbackrest conf

bhidapa · Nov 23, 2023 · c0db077 · c0db077
1 parent 2a1bc7f
commit c0db077
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,7 @@ POSTGRES_USER=postgres
 POSTGRES_DB=heltin
 POSTGRES_PORT=54321
 POSTGRES_PASSWORD=wowmuchsecret
+PGBACKREST_CONF_PATH=./database/pgbackrest.conf
 
 # graphql
 POSTGRES_SCHEMAS=public

diff --git a/.github/workflows/reusable-deploy-workflow.yml b/.github/workflows/reusable-deploy-workflow.yml
@@ -19,6 +19,8 @@ on:
         required: true
       POSTGRES_PASSWORD:
         required: true
+      PGBACKREST_CONF_PATH:
+        required: true
 
 jobs:
   deploy:
@@ -62,4 +64,5 @@ jobs:
           APP_DOMAINS: ${{ secrets.APP_DOMAINS }}
           SESSION_SECRET: ${{ secrets.SESSION_SECRET }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          PGBACKREST_CONF_PATH: ${{ secrets.PGBACKREST_CONF_PATH }}
         run: docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --wait
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -33,8 +33,7 @@ RUN rm -rf /tmp/pgbackrest-release && \
 RUN apt-get autoremove -y && \
   rm -rf /var/lib/apt/lists/*
 
-# configure pgBackRest
-COPY --chown=postgres:postgres database/pgbackrest.conf $PGBACKREST_CONFIG_PATH
+# configure Postgres for pgBackRest
 COPY --chown=postgres:postgres database/pgbackrest.postgresql.conf $PGBACKREST_CONFIG_PATH
 RUN cat $PGBACKREST_CONFIG_PATH/pgbackrest.postgresql.conf >> /usr/share/postgresql/postgresql.conf.sample
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,6 +26,7 @@ services:
     volumes:
       - database-data:/var/lib/postgresql/data
       - pgbackrest-repo:/var/lib/pgbackrest
+      - ${PGBACKREST_CONF_PATH}:/etc/pgbackrest/pgbackrest.conf
     healthcheck:
       test: psql --set=ON_ERROR_STOP=1 --username=$$POSTGRES_USER --dbname=$$POSTGRES_DB --command='select 1 from public.user;' > /dev/null 2>&1 || exit 1
       interval: 7s