PHRAS-3049 #comment Move Mailhog, builder from overide to docker compose, mount cache in builder

.env

@@ -29,9 +29,9 @@ SESSION_CACHE_LIMITER=off
 # PHP LOG LEVEL : Possible Values: alert, error, warning, notice, debug
 PHP_LOG_LEVEL=warning
 
-# --------------- APPLICATION STARTUP CONFIGURATION  --------------------
+# --------------- PHRASEANET CONFIGURATION --------------------
 
-# These variables are only used if the configuration.yml file is not present, in order to automate the installation procedure
+# These variables are used in the configuration.yml .
 
 # set here the first user / email couple
 PHRASEANET_ADMIN_ACCOUNT_EMAIL=admin@alchemy.fr
@@ -49,8 +49,6 @@ PHRASEANET_SERVER_NAME=localhost
 # Mysql max allowed packet
 MYSQL_MAX_ALLOWED_PACKET=16M
 
-# --------------- APPLICATION CONFIGURATION --------------------
-
 # api
 PHRASEANET_API_ENABLED=true
 PHRASEANET_API_SSL=true
@@ -80,7 +78,7 @@ PHRASEANET_SUBNET_IPS=172.32.0.0/16
 XDEBUG_REMOTE_HOST=172.32.0.1
 PHP_IDE_CONFIG=serverName=docker-server-phraseanet
 
-# Volumes location for dev
+# Volumes location 
 PHRASEANET_CONFIG_DIR=./config
 PHRASEANET_LOGS_DIR=./logs
 PHRASEANET_DATA_DIR=./datas

docker-compose.override.yml

@@ -18,28 +18,6 @@ services:
     - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
     - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
 
-  builder:
-    build:
-      context: .
-      target: builder
-      args:
-        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
-        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
-    stdin_open: true
-    tty: true
-    volumes:
-      - ../:/var/alchemy
-      - .:/var/alchemy/Phraseanet
-      - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-      - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-      - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-      - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-      - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-      - ${SSH_AUTH_SOCK}:/ssh-auth-sock
-      - ${HOME}/.ssh:/home/app/.ssh
-      - dev_vol:/home/app
-    environment:
-      - PHRASEANET_PROJECT_NAME
 
   phraseanet:
     environment:
@@ -75,11 +53,6 @@ services:
     volumes:
     - ${PHRASEANET_DB_DIR}:/var/lib/mysql:rw
 
-  mailhog:
-    image: mailhog/mailhog
-    ports:
-    - 1025:1025
-    - 8025:8025
 
   elasticsearch:
     ports:
@@ -122,6 +95,3 @@ networks:
       config:
         - subnet: $PHRASEANET_SUBNET_IPS
 
-volumes:
-  dev_vol:
-    driver: local

docker-compose.yml

@@ -11,9 +11,9 @@ services:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-nginx:$PHRASEANET_DOCKER_TAG
     restart: on-failure
     volumes:
-    - data_vol:/var/alchemy/Phraseanet/datas:rw
-    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
     depends_on:
     - phraseanet
     environment:
@@ -64,13 +64,13 @@ services:
     - PHRASEANET_SMTP_USER
     - PHRASEANET_SMTP_PASSWORD
     volumes:
-    - config_vol:/var/alchemy/Phraseanet/config:rw
-    - data_vol:/var/alchemy/Phraseanet/datas:rw
-    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
-    - logs_vol:/var/alchemy/Phraseanet/logs:rw
-    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
-    - cache_vol:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
+    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
 
   worker:
     build:
@@ -94,13 +94,13 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     volumes:
-    - config_vol:/var/alchemy/Phraseanet/config:rw
-    - data_vol:/var/alchemy/Phraseanet/datas:rw
-    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
-    - logs_vol:/var/alchemy/Phraseanet/logs:rw
-    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
-    - cache_vol:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
+    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
 
   db:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG
@@ -110,7 +110,7 @@ services:
     - MYSQL_ROOT_PASSWORD
     - MYSQL_MAX_ALLOWED_PACKET
     volumes:
-    - db_vol:/var/lib/mysql
+    - ${PHRASEANET_DB_DIR}:/var/lib/mysql
 
   rabbitmq:
     image: rabbitmq:3-management
@@ -128,7 +128,37 @@ services:
     build: ./docker/elasticsearch
     restart: on-failure
     volumes:
-    - elasticsearch_vol:/usr/share/elasticsearch/data
+    - ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data
+
+  builder:
+    build:
+      context: .
+      target: builder
+      args:
+        - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY}
+        - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS}
+    stdin_open: true
+    tty: true
+    volumes:
+      - ../:/var/alchemy
+      - .:/var/alchemy/Phraseanet
+      - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+      - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+      - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+      - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+      - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+      - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+      - ${SSH_AUTH_SOCK}:/ssh-auth-sock
+      - ${HOME}/.ssh:/home/app/.ssh
+      - dev_vol:/home/app
+    environment:
+      - PHRASEANET_PROJECT_NAME
+
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+    - 1025:1025
+    - 8025:8025
 
 volumes:
   config_vol:
@@ -150,3 +180,5 @@ volumes:
   # to be replacer by stdout/stderr
   logs_vol:
     driver: local
+  dev_vol:
+    driver: local