Use .env file instead of hard coded environment variables (#41)

Use .env file instead of hard coded environment variables

.gitignore

@@ -0,0 +1,2 @@
+.env
+data

README.md

@@ -34,14 +34,8 @@ $ git clone https://github.com/MISP/misp-docker
 $ cd misp-docker
 ```
 ## 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
-* Changed the volumes to match your local filesystem
+Copy template.env to .env (on the root directory) and edit the environment variables at .env file
+
 
 ## Build the containers
 ```

docker-compose-nginx.yml

@@ -18,27 +18,27 @@ services:
     restart: unless-stopped
     volumes:
       - /dev/urandom:/dev/random
-      - /data/misp/web:/var/www/MISP
+      - ${DATA_DIR}/web:/var/www/MISP
     environment:
       - MYSQL_HOST=db
-      - MYSQL_DATABASE=misp
-      - MYSQL_USER=misp
-      - MYSQL_PASSWORD=misp
-      - MISP_ADMIN_EMAIL=admin@admin.test
-      - MISP_ADMIN_PASSPHRASE=admin
-      - MISP_BASEURL=http:\/\/misp\.test
-      - POSTFIX_RELAY_HOST=relay.fqdn
-      - TIMEZONE=Europe/Brussels
+      - 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}
 
   db:
     container_name: misp_db
     image: mysql/mysql-server:5.7
     restart: unless-stopped
     volumes:
-      - /data/misp/db:/var/lib/mysql
+      - ${DATA_DIR}/db:/var/lib/mysql
     environment:
-      - MYSQL_DATABASE=misp
-      - MYSQL_USER=misp
-      - MYSQL_PASSWORD=misp
-      - MYSQL_ROOT_PASSWORD=misp
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
 

docker-compose.yml

@@ -12,26 +12,26 @@ services:
       - "80:80"
     volumes:
       - /dev/urandom:/dev/random
-      - /data/misp/web:/var/www/MISP
+      - ${DATA_DIR}/web:/var/www/MISP
     environment:
       - MYSQL_HOST=db
-      - MYSQL_DATABASE=misp
-      - MYSQL_USER=misp
-      - MYSQL_PASSWORD=misp
-      - MISP_ADMIN_EMAIL=admin@admin.test
-      - MISP_ADMIN_PASSPHRASE=admin
-      - MISP_BASEURL=http:\/\/misp\.test
-      - POSTFIX_RELAY_HOST=relay.fqdn
-      - TIMEZONE=Europe/Brussels
+      - 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}
 
   db:
     container_name: misp_db
     image: mysql/mysql-server:5.7
     restart: unless-stopped
     volumes:
-      - /data/misp/db:/var/lib/mysql
+      - ${DATA_DIR}/db:/var/lib/mysql
     environment:
-      - MYSQL_DATABASE=misp
-      - MYSQL_USER=misp
-      - MYSQL_PASSWORD=misp
-      - MYSQL_ROOT_PASSWORD=misp
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}

template.env

@@ -0,0 +1,13 @@
+MYSQL_DATABASE=misp
+MYSQL_USER=misp
+MYSQL_PASSWORD=misp
+MYSQL_ROOT_PASSWORD=misp
+
+MISP_ADMIN_EMAIL=admin@admin.test
+MISP_ADMIN_PASSPHRASE=admin
+MISP_BASEURL=localhost
+
+POSTFIX_RELAY_HOST=relay.fqdn
+TIMEZONE=Europe/Brussels
+
+DATA_DIR=./data