Use DATABASE_URL in pgdumper

GeoNode · Feb 18, 2019 · 1cc7725 · 1cc7725
1 parent b6c75f7
commit 1cc7725
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/scripts/spcgeonode/docker-compose.yml b/scripts/spcgeonode/docker-compose.yml
@@ -130,6 +130,8 @@ services:
   pgdumper:
     image: olivierdalang/spcgeonode:pgdumper-latest
     build: ./pgdumper/
+    environment:
+      - DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres
     volumes:
       - pgdumps:/spcgeonode-pgdumps/ 
     restart: on-failure

diff --git a/scripts/spcgeonode/pgdumper/Dockerfile b/scripts/spcgeonode/pgdumper/Dockerfile
@@ -6,11 +6,14 @@ RUN apk add --no-cache postgresql-client && \
     cp /usr/bin/pg_dump /bin/pg_dump && \
     apk del BUIID_DEPS
 
+# envsubst dependency
+RUN apk add --no-cache gettext
 
 # The entrypoint creates the certificate
-ADD crontab crontab 
-RUN /usr/bin/crontab crontab
-RUN rm crontab
+ADD crontab crontab.envsubst
+ADD docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
 
 # We run cron in foreground to update the certificates
 CMD ["/usr/sbin/crond", "-f"]
diff --git a/scripts/spcgeonode/pgdumper/crontab b/scripts/spcgeonode/pgdumper/crontab
@@ -5,4 +5,4 @@
 # │     │     │     │     ┌───────────── day of week (0 - 6) (Sunday to Saturday; 7 is also Sunday on some systems)
 # │     │     │     │     │
 
-  0     0     *     *     *     date && pg_dump -C -h postgres -U postgres postgres > /spcgeonode-pgdumps/latest.pgdump && echo "Dump successful"
+  0     0     *     *     *     date && pg_dump -C "${DATABASE_URL}" > /spcgeonode-pgdumps/latest.pgdump && echo "Dump successful"
diff --git a/scripts/spcgeonode/pgdumper/docker-entrypoint.sh b/scripts/spcgeonode/pgdumper/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+envsubst '\$DATABASE_URL' < crontab.envsubst > crontab
+/usr/bin/crontab crontab
+rm crontab crontab.envsubst
+
+exec "$@"