Docker Compose variables, client_max_body_size=8m

DefectDojo · Mar 11, 2019 · 9e0a730 · 9e0a730
1 parent 8353626
commit 9e0a730
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,45 +7,54 @@ services:
       - uwsgi
     ports:
       - target: 8080
-        published: 8080
+        published: ${DD_PORT:-8080}
         protocol: tcp
         mode: host
   uwsgi:
     image: defectdojo/defectdojo-django:latest
     depends_on:
       - mysql
     environment:
-      DD_CELERY_BROKER_USER: guest
-      DD_CELERY_BROKER_PASSWORD: guest
+      DD_ALLOWED_HOSTS: ${DD_ALLOWED_HOSTS:-localhost}
+      DD_CELERY_BROKER_USER: ${DD_CELERY_BROKER_USER:-guest}
+      DD_CELERY_BROKER_PASSWORD: ${DD_CELERY_BROKER_USER:-guest}
   celerybeat:
     image: defectdojo/defectdojo-django:latest
     depends_on:
       - mysql
       - rabbitmq
     entrypoint: ['/entrypoint-celery-beat.sh']
     environment:
-      DD_CELERY_BROKER_USER: guest
-      DD_CELERY_BROKER_PASSWORD: guest
+      DD_CELERY_BROKER_USER: ${DD_CELERY_BROKER_USER:-guest}
+      DD_CELERY_BROKER_PASSWORD: ${DD_CELERY_BROKER_USER:-guest}
+      DD_DATABASE_NAME: ${DD_DATABASE_NAME:-defectdojo}
+      DD_DATABASE_USER: ${DD_DATABASE_USER:-defectdojo}
+      DD_DATABASE_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}
   celeryworker:
     image: defectdojo/defectdojo-django:latest
     depends_on:
       - mysql
       - rabbitmq
     entrypoint: ['/entrypoint-celery-worker.sh']
     environment:
-      DD_CELERY_BROKER_USER: guest
-      DD_CELERY_BROKER_PASSWORD: guest
+      DD_CELERY_BROKER_USER: ${DD_CELERY_BROKER_USER:-guest}
+      DD_CELERY_BROKER_PASSWORD: ${DD_CELERY_BROKER_USER:-guest}
   initializer:
     image: defectdojo/defectdojo-django:latest
     depends_on:
       - mysql
     entrypoint: ['/entrypoint-initializer.sh']
+    environment:
+      DD_ADMIN_USER: ${DD_ADMIN_USER:-guest}
+      DD_ADMIN_MAIL: ${DD_ADMIN_USER:-admin@defectdojo.local}
+      DD_ADMIN_FIRST_NAME: ${DD_ADMIN_FIRST_NAME:-Admin}
+      DD_ADMIN_LAST_NAME: ${DD_ADMIN_LAST_NAME:-Admin}
   mysql:
     image: mysql:5.7
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
-      MYSQL_USER: defectdojo
-      MYSQL_PASSWORD: defectdojo
-      MYSQL_DATABASE: defectdojo
+      MYSQL_USER: ${DD_DATABASE_USER:-defectdojo}
+      MYSQL_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}
+      MYSQL_DATABASE: ${DD_DATABASE_NAME:-defectdojo}
   rabbitmq:
     image: rabbitmq:3.7
diff --git a/helm/defectdojo/templates/configmap.yaml b/helm/defectdojo/templates/configmap.yaml
@@ -10,7 +10,7 @@ metadata:
     helm.sh/chart: {{ include "defectdojo.chart" . }}
 data:
   DD_ADMIN_USER: {{ .Values.admin.user | default "admin" }}
-  DD_ADMIN_MAIL: {{ .Values.admin.Mail | default "admin@defectcojo.local" }}
+  DD_ADMIN_MAIL: {{ .Values.admin.Mail | default "admin@defectdojo.local" }}
   DD_ADMIN_FIRST_NAME: {{ .Values.admin.FirstName | default "Admin" }}
   DD_ADMIN_LAST_NAME: {{ .Values.admin.LastName | default "User" }}
   DD_ALLOWED_HOSTS: {{ .Values.host }}

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -11,6 +11,7 @@ http {
                     '$status $body_bytes_sent "$http_referer" '
                     '"$http_user_agent" "$http_x_forwarded_for"';
   access_log /var/log/nginx/access.log main;
+  client_max_body_size 8m;
   sendfile on;
   keepalive_timeout 65;
   upstream uwsgi_server {