Parameterises data volumes & postgress password (#21)

* parameterise opdata & pgdata

* postgres pwd var

* pwd quotes

* postgress password variable rename

Co-authored-by: RichardJActon <richardjacton@uni-koeln.de>

compose/docker-compose.control.yml

@@ -14,7 +14,7 @@ services:
     environment:
       PGDATA: /var/lib/postgresql/data
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
       - "./control:/control"
     entrypoint: ["/control/upgrade/entrypoint.sh"]
   backup:
@@ -25,8 +25,8 @@ services:
       PGDATA: /var/lib/postgresql/data
       OPDATA: /var/openproject/assets
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
-      - "opdata:/var/openproject/assets"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
+      - "${OPDATA:-opdata}:/var/openproject/assets"
       - "./backups:/backups"
       - "./control:/control"
     entrypoint: ["/control/backup/entrypoint.sh"]

compose/docker-compose.yml

@@ -25,7 +25,7 @@ x-op-app: &app
     # set to true to enable the email receiving feature. See ./docker/cron for more options
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
-    - "opdata:/var/openproject/assets"
+    - "${OPDATA:-opdata}:/var/openproject/assets"
 
 services:
   db:
@@ -33,9 +33,9 @@ services:
     <<: *restart_policy
     stop_grace_period: "3s"
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
+      - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
     environment:
-      POSTGRES_PASSWORD: p4ssw0rd
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-p4ssw0rd}
       POSTGRES_DB: openproject
     networks:
       - backend
@@ -112,3 +112,4 @@ services:
     restart: on-failure
     networks:
       - backend
+