Fix: Use default values for DD_DOCKERCOMPOSE_[BROKER|DATABASE] (#8683)

DefectDojo · Sep 21, 2023 · 0636e9b · 0636e9b
1 parent 68eb8fc
commit 0636e9b
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       context: ./
       dockerfile: "Dockerfile.nginx-${DEFECT_DOJO_OS:-debian}"
     image: "defectdojo/defectdojo-nginx:${NGINX_VERSION:-latest}"
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
       - postgres-rabbitmq
@@ -39,13 +39,13 @@ services:
       dockerfile: "Dockerfile.django-${DEFECT_DOJO_OS:-debian}"
       target: django
     image: "defectdojo/defectdojo-django:${DJANGO_VERSION:-latest}"
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
       - postgres-rabbitmq
       - postgres-redis
     depends_on:
-      - ${DD_DOCKERCOMPOSE_DATABASE}
+      - ${DD_DOCKERCOMPOSE_DATABASE:-postgres}
     entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST}:${DD_DATABASE_PORT}', '-t', '30', '--', '/entrypoint-uwsgi.sh']
     environment:
       DD_DEBUG: 'False'
@@ -62,14 +62,14 @@ services:
         - "defectdojo_media:${DD_MEDIA_ROOT:-/app/media}"
   celerybeat:
     image: "defectdojo/defectdojo-django:${DJANGO_VERSION:-latest}"
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
       - postgres-rabbitmq
       - postgres-redis
     depends_on:
-      - ${DD_DOCKERCOMPOSE_DATABASE}
-      - ${DD_DOCKERCOMPOSE_BROKER}
+      - ${DD_DOCKERCOMPOSE_DATABASE:-postgres}
+      - ${DD_DOCKERCOMPOSE_BROKER:-redis}
     entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST}:${DD_DATABASE_PORT}', '-t', '30', '--', '/entrypoint-celery-beat.sh']
     environment:
       DD_DATABASE_URL: ${DD_DATABASE_URL}
@@ -82,14 +82,14 @@ services:
           target: /app/docker/extra_settings
   celeryworker:
     image: "defectdojo/defectdojo-django:${DJANGO_VERSION:-latest}"
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
       - postgres-rabbitmq
       - postgres-redis
     depends_on:
-      - ${DD_DOCKERCOMPOSE_DATABASE}
-      - ${DD_DOCKERCOMPOSE_BROKER}
+      - ${DD_DOCKERCOMPOSE_DATABASE:-postgres}
+      - ${DD_DOCKERCOMPOSE_BROKER:-redis}
     entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST}:${DD_DATABASE_PORT}', '-t', '30', '--', '/entrypoint-celery-worker.sh']
     environment:
       DD_DATABASE_URL: ${DD_DATABASE_URL}
@@ -103,13 +103,13 @@ services:
         - "defectdojo_media:${DD_MEDIA_ROOT:-/app/media}"
   initializer:
     image: "defectdojo/defectdojo-django:${DJANGO_VERSION:-latest}"
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
       - postgres-rabbitmq
       - postgres-redis
     depends_on:
-      - ${DD_DOCKERCOMPOSE_DATABASE}
+      - ${DD_DOCKERCOMPOSE_DATABASE:-postgres}
     entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST}:${DD_DATABASE_PORT}', '--', '/entrypoint-initializer.sh']
     environment:
       DD_DATABASE_URL: ${DD_DATABASE_URL}
@@ -126,7 +126,7 @@ services:
           target: /app/docker/extra_settings
   mysql:
     image: mysql:5.7.43@sha256:2c23f254c6b9444ecda9ba36051a9800e8934a2f5828ecc8730531db8142af83
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - mysql-redis
     environment:
@@ -139,7 +139,7 @@ services:
       - defectdojo_data:/var/lib/mysql
   postgres:
     image: postgres:15.4-alpine@sha256:8bc3c893342c766481df5fde58fab6f1a1115b94eb56778126163305243e9709
-    profiles: 
+    profiles:
       - postgres-rabbitmq
       - postgres-redis
     environment:
@@ -150,14 +150,14 @@ services:
       - defectdojo_postgres:/var/lib/postgresql/data
   rabbitmq:
     image: rabbitmq:3.12.4-alpine@sha256:1db3f856e6628e2ac512a91959437ca5bab5112c856fe730b6b5ff5087e5e3d0
-    profiles: 
+    profiles:
       - mysql-rabbitmq
       - postgres-rabbitmq
     volumes:
        - defectdojo_rabbitmq:/var/lib/rabbitmq
   redis:
     image: redis:7.2.0-alpine@sha256:fd5de2340bc46cbc2241975ab027797c350dec6fd86349e3ac384e3a41be6fee
-    profiles: 
+    profiles:
       - mysql-redis
       - postgres-redis
     volumes: