[#293] remove setup_configuration volume from web container

maykinmedia · Dec 4, 2024 · 837f265 · 837f265
1 parent bacd852
commit 837f265
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     # See: https://hub.docker.com/_/postgres/
     image: postgres
     environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
+      POSTGRES_HOST_AUTH_METHOD: trust
     # NOTE: this works for bitnami, not sure if this works for regular
     # postgres image
     volumes:
@@ -18,27 +18,24 @@ services:
     image: maykinmedia/open-klant:latest
     build: .
     environment: &web_env
-      - DJANGO_SETTINGS_MODULE=openklant.conf.docker
-      - IS_HTTPS=no
-      - DB_NAME=postgres
-      - DB_USER=postgres
-      - DB_HOST=db
-      - ALLOWED_HOSTS=*
-      - CACHE_DEFAULT=redis:6379/0
-      - CACHE_AXES=redis:6379/0
-      - SUBPATH=${SUBPATH:-/}
-      - SECRET_KEY=${SECRET_KEY:-django-insecure-f8s@b*ds4t84-q_2#c0j0506@!l2q6r5_pq5e!vm^_9c*#^66b}
-      - CELERY_BROKER_URL=redis://redis:6379/0
-      - CELERY_RESULT_BACKEND=redis://redis:6379/0
-      - DISABLE_2FA=true
+      DJANGO_SETTINGS_MODULE: openklant.conf.docker
+      IS_HTTPS: no
+      DB_NAME: postgres
+      DB_USER: postgres
+      DB_HOST: db
+      ALLOWED_HOSTS: '*'
+      CACHE_DEFAULT: redis:6379/0
+      CACHE_AXES: redis:6379/0
+      SUBPATH: ${SUBPATH:-/}
+      SECRET_KEY: ${SECRET_KEY:-django-insecure-f8s@b*ds4t84-q_2#c0j0506@!l2q6r5_pq5e!vm^_9c*#^66b}
+      CELERY_BROKER_UR: =redis://redis:6379/0
+      CELERY_RESULT_BACKEND: redis://redis:6379/0
+      DISABLE_2FA: true
 
-      # Django-setup-configuration
-      - RUN_SETUP_CONFIG=${RUN_SETUP_CONFIG:-true}
-    volumes: &web_volumes
+    volumes:
       - media:/app/media
       - private_media:/app/private_media
       - log:/app/log
-      - ./docker/setup_configuration:/app/setup_configuration
     ports:
       - 8000:8000
     depends_on:
@@ -51,9 +48,15 @@ services:
 
   web-init:
     build: .
-    environment: *web_env
+    environment:
+      <<: *web_env
+      #
+      # Django-setup-configuration
+      RUN_SETUP_CONFIG: ${RUN_SETUP_CONFIG:-true}
     command: /setup_configuration.sh
-    volumes: *web_volumes
+    volumes:
+      - log:/app/log
+      - ./docker/setup_configuration:/app/setup_configuration
     depends_on:
       - db
       - redis