Merge branch 'MISP:master' into hotfix/build-error-on-m1-mac

docker-compose.yml

@@ -14,28 +14,32 @@ services:
     volumes:
       - ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro
       - /dev/urandom:/dev/random
-      - ${DATA_DIR}/web:/var/www/MISP
+      - ${DATA_DIR:-./data}/web:/var/www/MISP
     environment:
-      - MYSQL_HOST=${MYSQL_HOST}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL}
-      - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE}
-      - MISP_BASEURL=${MISP_BASEURL}
-      - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST}
-      - TIMEZONE=${TIMEZONE}
-    entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST} -p 3306 -- /run.sh"
+      - MYSQL_HOST=${MYSQL_HOST:-misp_db}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
+      - MYSQL_USER=${MYSQL_USER:-misp}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
+      - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL:-admin@admin.test}
+      - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin}
+      - MISP_BASEURL=${MISP_BASEURL:-https://localhost}
+      - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn}
+      - TIMEZONE=${TIMEZONE:-UTC}
+    entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh"
 
   db:
     container_name: misp_db
     image: mysql/mysql-server:5.7
-    hostname: ${MYSQL_HOST}
+    hostname: ${MYSQL_HOST:-misp_db}
     restart: unless-stopped
     volumes:
-      - ${DATA_DIR}/db:/var/lib/mysql
+      - ${DATA_DIR:-./data}/db:/var/lib/mysql
     environment:
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
+      - MYSQL_USER=${MYSQL_USER:-misp}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-misp}
+
+volumes:
+  web:
+  db:

web/Dockerfile

@@ -59,11 +59,13 @@ RUN ( \
     echo 'command=/bin/bash /var/www/MISP/app/Console/worker/start.sh'; \
     echo 'startsecs = 0'; \
     echo 'autorestart = false'; \
+    echo 'user=www-data'; \
     echo ''; \
     echo '[program:misp-modules]'; \
     echo 'command=/bin/bash -c "/var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s"'; \
     echo 'startsecs = 0'; \
     echo 'autorestart = false'; \
+    echo 'user=www-data'; \
     ) >> /etc/supervisor/conf.d/supervisord.conf
 
 # Add run script