Adapt the proxy part to fit with the new naming et simplified db part

docker-compose-nginx.yml

@@ -3,59 +3,42 @@ version: '2'
 services:
   proxy:
     build:
-      context: misp-proxy
+      context: proxy
-    container_name: misp-proxy
+    container_name: proxy
-    depends_on:
+    restart: unless-stopped
-      - misp-web
-    hostname: misp-proxy
     image: misp-proxy:latest
-    networks:
-      - misp-network
     ports:
-      - 81:80
+      - 80:80
       - 4443:443
 
-  misp-web:
+  web:
-    build: misp-web
+    build: web
-    depends_on:
+    container_name: misp_web
-      - misp-db
+    image: misp:latest
-    container_name: misp-web
+    restart: unless-stopped
-    hostname: misp-web
-    image: misp-web:latest
-    restart: always
-    networks:
-      - misp-network
-    links:
-      - misp-db
     volumes:
       - /dev/urandom:/dev/random
-      - /data/misp:/var/www/MISP
+      - /data/misp/web:/var/www/MISP
     environment:
-      - MYSQL_ROOT_PASSWORD=xxxxxxxx
+      - MYSQL_HOST=db
-      - MYSQL_MISP_PASSWORD=xxxxxxxx
+      - MYSQL_DATABASE=misp
-      - MYSQL_HOST=misp-db
+      - 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:
+  db:
-    build: 
+    container_name: misp_db
-      context: misp-db
+    image: mysql/mysql-server:5.7
-      args:
+    restart: unless-stopped
-        MYSQL_MISP_PASSWORD: xxxxxxxx
-    container_name: misp-db
-    hostname: misp-db
-    image: misp-db:latest
-    restart: always
-    networks:
-      - misp-network
     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
 
-networks:
-  misp-network:
-    driver: bridge

proxy/default.conf

@@ -2,7 +2,7 @@
 server {
     listen 80;
     listen 443 ssl http2;
-    server_name misp.test;
+    server_name web;
 
     if ($scheme != "https") {
     	rewrite ^ https://$host$uri permanent;