DB part reworked to use std mysql database creation way, docker-compose simplified

README.md

@@ -36,6 +36,9 @@ docker build -t misp .
 ```
 ## Fix your environment
 Edit the docker-compose.yml and change the following environment variables:
+* MYSQL_DATABASE
+* MYSQL_USER
+* MYSQL_PASSWORD
 * MYSQL_ROOT_PASSWORD
 * MYSQL_MISP_PASSWORD
 * MISP_ADMIN_PASSPHRASE

docker-compose.yml

@@ -1,49 +1,35 @@
 version: '2'
 
-networks:
-  misp-network:
-    driver: bridge
-
 services:
-  misp-web:
-    build: misp-web
-    depends_on:
-      - misp-db
-    container_name: misp-web
-    hostname: misp-web
-    image: misp-web:latest
-    restart: always
-    networks:
-      - misp-network
-    links:
-      - misp-db
+  web:
+    build: web
+    container_name: misp_web
+    image: misp:latest
+    restart: unless-stopped
     ports:
       - "80:80"
     volumes:
       - /dev/urandom:/dev/random
-      - /data/misp:/var/www/MISP
+      - /data/misp/web:/var/www/MISP
     environment:
-      - MYSQL_ROOT_PASSWORD=xxxxxxxx
-      - MYSQL_MISP_PASSWORD=xxxxxxxx
-      - MYSQL_HOST=misp-db
+      - MYSQL_HOST=db
+      - MYSQL_DATABASE=misp
+      - MYSQL_USER=misp
+      - MYSQL_PASSWORD=misp
       - MISP_ADMIN_EMAIL=admin@admin.test
-      - MISP_ADMIN_PASSPHRASE=xxxxxxxxx
+      - MISP_ADMIN_PASSPHRASE=admin
       - MISP_BASEURL=http:\/\/misp\.test
       - POSTFIX_RELAY_HOST=relay.fqdn
       - TIMEZONE=Europe/Brussels
 
-  misp-db:
-    build: 
-      context: misp-db
-      args:
-        MYSQL_MISP_PASSWORD: xxxxxxxx
-    container_name: misp-db
-    hostname: misp-db
-    image: misp-db:latest
-    restart: always
-    networks:
-      - misp-network
+  db:
+    container_name: misp_db
+    image: mysql/mysql-server:5.7
+    restart: unless-stopped
     volumes:
-      - /data/mysql:/var/lib/mysql
+      - /data/misp/db:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=xxxxxxxx
+      - MYSQL_DATABASE=misp
+      - MYSQL_USER=misp
+      - MYSQL_PASSWORD=misp
+      - MYSQL_ROOT_PASSWORD=misp

misp-db/Dockerfile

@@ -1,10 +0,0 @@
-#
-# Dockerfile to customize the MISP MySQL container
-#
-
-FROM mysql/mysql-server:5.7
-MAINTAINER Xavier Mertens <xavier@rootshell.be>
-
-ARG MYSQL_MISP_PASSWORD
-COPY init-misp-db.sql /docker-entrypoint-initdb.d/
-RUN sed -i "s/XXXXXXXX/$MYSQL_MISP_PASSWORD/" /docker-entrypoint-initdb.d/init-misp-db.sql

misp-db/init-misp-db.sql

@@ -1,4 +0,0 @@
-CREATE DATABASE misp;
-CREATE USER 'misp' IDENTIFIED BY 'XXXXXXXX';
-GRANT ALL ON misp.* TO 'misp'@'%';
-FLUSH PRIVILEGES;

web/run.sh

@@ -5,6 +5,7 @@
 #
 # 2017/05/17 - Created
 # 2017/05/31 - Fixed small errors
+# 2019/10/17 - Use built-in mysql docker DB creation and use std env names (dafal)
 #
 
 set -e
@@ -44,16 +45,22 @@ if [ -r /.firstboot.tmp ]; then
                 echo "MYSQL_HOST is not set. Aborting."
                 exit 1
         fi
-
-        # Set MYSQL_MISP_PASSWORD
-        if [ -z "$MYSQL_MISP_PASSWORD" ]; then
-                echo "MYSQL_MISP_PASSWORD is not set, use default value 'misp'"
-                MYSQL_MISP_PASSWORD=misp
+		
+		# Waiting for DB to be ready
+		while ! mysqladmin ping -h"$MYSQL_HOST" --silent; do
+		    sleep 5
+			echo "Waiting for database to be ready..."
+		done
+		
+        # Set MYSQL_PASSWORD
+        if [ -z "$MYSQL_PASSWORD" ]; then
+                echo "MYSQL_PASSWORD is not set, use default value 'misp'"
+                MYSQL_PASSWORD=misp
         else
-                echo "MYSQL_MISP_PASSWORD is set to '$MYSQL_MISP_PASSWORD'"
+                echo "MYSQL_PASSWORD is set to '$MYSQL_PASSWORD'"
         fi
 
-        ret=`echo 'SHOW TABLES;' | mysql -u misp --password="$MYSQL_MISP_PASSWORD" -h $MYSQL_HOST -P 3306 misp # 2>&1`
+        ret=`echo 'SHOW TABLES;' | mysql -u $MYSQL_USER --password="$MYSQL_PASSWORD" -h $MYSQL_HOST -P 3306 $MYSQL_DATABASE # 2>&1`
         if [ $? -eq 0 ]; then
                 echo "Connected to database successfully!"
                 found=0
@@ -66,7 +73,7 @@ if [ -r /.firstboot.tmp ]; then
                         echo "Database misp available"
                 else
                         echo "Database misp empty, creating tables ..."
-                        ret=`mysql -u misp --password="$MYSQL_MISP_PASSWORD" misp -h $MYSQL_HOST -P 3306 2>&1 < /var/www/MISP/INSTALL/MYSQL.sql`
+                        ret=`mysql -u $MYSQL_USER --password="$MYSQL_PASSWORD" $MYSQL_DATABASE -h $MYSQL_HOST -P 3306 2>&1 < /var/www/MISP/INSTALL/MYSQL.sql`
                         if [ $? -eq 0 ]; then
                             echo "Imported /var/www/MISP/INSTALL/MYSQL.sql successfully"
                         else
@@ -84,9 +91,9 @@ if [ -r /.firstboot.tmp ]; then
         cd /var/www/MISP/app/Config
         cp -a database.default.php database.php
         sed -i "s/localhost/$MYSQL_HOST/" database.php
-        sed -i "s/db\s*login/misp/" database.php
+        sed -i "s/db\s*login/$MYSQL_DATABASE/" database.php
         sed -i "s/8889/3306/" database.php
-        sed -i "s/db\s*password/$MYSQL_MISP_PASSWORD/" database.php
+        sed -i "s/db\s*password/$MYSQL_PASSWORD/" database.php
 
         # Fix the base url
         if [ -z "$MISP_BASEURL" ]; then