From 090ff844e317754eac64b586e4587a6dbab2337a Mon Sep 17 00:00:00 2001
From: Arthur de Moulins <arthurdemoulins@gmail.com>
Date: Fri, 28 Feb 2020 17:00:31 +0100
Subject: [PATCH] use custom volumes in docker-compose.override

---
 .dockerignore               |  1 +
 .env                        |  8 ++++++++
 .gitignore                  |  2 ++
 README.md                   |  6 +++---
 docker-compose.override.yml | 34 ++++++++++++++++++++--------------
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e72dba2406..a79f380ade 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -26,6 +26,7 @@
 /plugins
 /tmp
 /vendor
+/volumes
 /www/assets
 /www/custom
 /www/plugins
diff --git a/.env b/.env
index c314382e24..064a771509 100644
--- a/.env
+++ b/.env
@@ -61,3 +61,11 @@ IDE_KEY=PHPSTORM
 PHRASEANET_SUBNET_IPS=172.32.0.0/16
 PHRASEANET_GATEWAY_IP=172.32.0.1
 PHP_IDE_CONFIG=serverName=docker-server-phraseanet
+
+# Volumes location for dev
+PHRASEANET_CONFIG_DIR=./config
+PHRASEANET_LOGS_DIR=./logs
+PHRASEANET_DATA_DIR=./datas
+PHRASEANET_DB_DIR=./volumes/db
+PHRASEANET_ELASTICSEARCH_DIR=./volumes/elasticsearch
+PHRASEANET_THUMBNAILS_DIR=./www/thumbnails
diff --git a/.gitignore b/.gitignore
index c5cce4bb70..ead2712de2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,5 @@ npm-debug.log
 /Phrasea_datas
 
 .env.*
+env.local
+/volumes
diff --git a/README.md b/README.md
index c2a4b6ed45..e56167d189 100644
--- a/README.md
+++ b/README.md
@@ -52,14 +52,14 @@ export INSTALL_ACCOUNT_PASSWORD=$3cr3t!
 export PHRASEANET_APP_PORT=8082
 ```
 
-### Using a .env.local
+### Using a env.local (custom .env)
 
 It may be easier to deal with a local file to manage our env variables.
 
-You can add your `.env.local` at the root of this project and define a command alias in your `~/.bashrc`:
+You can add your `env.local` at the root of this project and define a command alias in your `~/.bashrc`:
 
 ```bash
-alias dc="env $(cat .env.local | grep -v '#' | tr '\n' ' ') docker-compose"
+alias dc="env $(cat env.local | grep -v '#' | tr '\n' ' ') docker-compose"
 ```
 
 ### Running the application
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index b1a5de201c..a950465f06 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -11,9 +11,9 @@ services:
   gateway:
     volumes:
     - .:/var/alchemy/Phraseanet
-    - ./datas:/var/alchemy/Phraseanet/datas:rw
-    - ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw
     - ./docker/nginx/root/entrypoint.sh:/entrypoint.sh
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
 
   builder:
     build:
@@ -22,10 +22,10 @@ services:
     command: exit 0
     volumes:
       - .:/var/alchemy/Phraseanet
-      - ./config:/var/alchemy/Phraseanet/config:rw
-      - ./logs:/var/alchemy/Phraseanet/logs:rw
-      - ./datas:/var/alchemy/Phraseanet/datas:rw
-      - ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw
+      - ${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:
     environment:
@@ -34,23 +34,27 @@ services:
     - PHP_IDE_CONFIG
     volumes:
     - .:/var/alchemy/Phraseanet
-    - ./config:/var/alchemy/Phraseanet/config:rw
-    - ./logs:/var/alchemy/Phraseanet/logs:rw
-    - ./datas:/var/alchemy/Phraseanet/datas:rw
-    - ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${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
 
   worker:
     volumes:
     - .:/var/alchemy/Phraseanet
-    - ./config:/var/alchemy/Phraseanet/config:rw
-    - ./logs:/var/alchemy/Phraseanet/logs:rw
-    - ./datas:/var/alchemy/Phraseanet/datas:rw
-    - ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${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
 
   rabbitmq:
     ports:
     - ${RABBITMQ_MANAGEMENT_PORT}:15672
 
+  db:
+    volumes:
+    - ${PHRASEANET_DB_DIR}:/var/lib/mysql:rw
+
   mailhog:
     image: mailhog/mailhog
     ports:
@@ -60,6 +64,8 @@ services:
   elasticsearch:
     ports:
     - 9200:9200
+    volumes:
+    - ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data:rw
 
 networks:
   default: