Dev version of compose, mysql volume and utf8mb4 support

Author: aaronweaver

DOCKER.md

@@ -24,6 +24,14 @@ If you ran DefectDojo with compose before and you want to prevent the
 initializer container from running again, define an environment variable
 DD_INITIALIZE=false to prevent re-initialization.
 
+### Develop with Docker Compose
+
+For developing the easiset way to make changes is to startup DefectDojo in debug by running `docker-compose -f docker-compose.yml up`. This starts the DefectDojo (uwsgi) container with manage.py and shares the local source directory so that changes to the code immediately restart the process.
+
+Navigate to the container directly, <http://localhost:8000>
+
+The initializer container can be disabled by exporting: `export DD_INITIALIZE=false`
+
 ### Build Images Locally
 
 Build the docker containers locally for testing purposes.
@@ -36,6 +44,14 @@ docker build -t defectdojo/defectdojo-nginx -f Dockerfile.nginx .
 
 ### Clean up Docker Compose
 
+Removes all containers 
+
+```zsh
+docker-compose down
+```
+
+Removes all containers, networks and the database volume
+
 ```zsh
 docker-compose down --volumes
 ```

docker-compose.override.yml

@@ -0,0 +1,14 @@
+---
+version: '3.7'
+services:
+  uwsgi:
+    image: defectdojo/defectdojo-django:latest
+    depends_on:
+      - mysql
+    entrypoint: ['/wait-for-it.sh', 'mysql:3306', '-t', '30', '--', '/entrypoint-uwsgi.sh']
+    environment:
+      DD_DEBUG: 'on'
+      DD_ALLOWED_HOSTS: ${DD_ALLOWED_HOSTS:-*}
+      DD_DATABASE_URL: ${DD_DATABASE_URL:-mysql://defectdojo:defectdojo@mysql:3306/defectdojo}
+      DD_CELERY_BROKER_USER: ${DD_CELERY_BROKER_USER:-guest}
+      DD_CELERY_BROKER_PASSWORD: ${DD_CELERY_BROKER_USER:-guest}

docker-compose.yml

@@ -11,10 +11,16 @@ services:
         protocol: tcp
         mode: host
   uwsgi:
-    image: defectdojo/defectdojo-django:latest
+    build: 
+      context: ./
+      dockerfile: Dockerfile.django
     depends_on:
       - mysql
-    entrypoint: ['/wait-for-it.sh', 'mysql:3306', '-t', '30', '--', '/entrypoint-uwsgi.sh']
+    entrypoint: ['/wait-for-it.sh', 'mysql:3306', '-t', '30', '--', 'python', 'manage.py', 'runserver 0.0.0.0:8000']
+    volumes:
+      - '.:/app'
+    ports:
+      - 8000:8000
     environment:
       DD_DEBUG: 'on'
       DD_ALLOWED_HOSTS: ${DD_ALLOWED_HOSTS:-*}
@@ -52,13 +58,19 @@ services:
       DD_ADMIN_MAIL: ${DD_ADMIN_USER:[email protected]}
       DD_ADMIN_FIRST_NAME: ${DD_ADMIN_FIRST_NAME:-Admin}
       DD_ADMIN_LAST_NAME: ${DD_ADMIN_LAST_NAME:-User}
+      DD_INITIALIZE: ${DD_INITIALIZE:-true}
   mysql:
     image: mysql:5.7
+    volumes:
+       - defectdojo_data:/var/lib/mysql
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
       DD_DATABASE_URL: ${DD_DATABASE_URL:-mysql://defectdojo:defectdojo@mysql:3306/defectdojo}
       MYSQL_USER: ${DD_DATABASE_USER:-defectdojo}
       MYSQL_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}
       MYSQL_DATABASE: ${DD_DATABASE_NAME:-defectdojo}
+    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
   rabbitmq:
     image: rabbitmq:3.7
+volumes:
+  defectdojo_data: {}