Merge branch 'master' into PHRAS-3148_thesaurus_guy

.env

@@ -96,6 +96,7 @@ PHRASEANET_DB_DIR=./volumes/db
 PHRASEANET_ELASTICSEARCH_DIR=./volumes/elasticsearch
 PHRASEANET_THUMBNAILS_DIR=./www/thumbnails
 PHRASEANET_CUSTOM_DIR=./www/custom
+PHRASEANET_PLUGINS_DIR=./www/plugins
 PHRASEANET_TMP_DIR=./tmp
 PHRASEANET_CACHE_DIR=./cache
 PHRASEANET_DOWNLOAD_DIR=./datas/download

README.md

@@ -35,6 +35,10 @@ And follow the install steps described at https://docs.phraseanet.com/4.0/en/Adm
 - docker-compose >=v1.25.4
 - docker >=v18.01-ce
 
+Note about elasticsearch container 
+Check this link
+https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-prod-prerequisites
+
 ## Get started
 
 You should review the default env variables defined in `.env` file.
@@ -84,8 +88,9 @@ docker-compose -f docker-compose.yml run --rm worker <command>
 ```
 
 Where `<command>` can be:
-- `bin/console task-manager:scheduler:run` (default)
-- `bin/console worker:execute -m 2`
+
+- `bin/console worker:execute -m 2` (default)
+- `bin/console task-manager:scheduler:run`
 - ...
 
 The default parameters allow you to reach the app with : `http://localhost:8082`

docker-compose.yml

@@ -14,6 +14,7 @@ services:
     - ${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_PLUGINS_DIR}:/var/alchemy/Phraseanet/www/plugins:rw
     depends_on:
     - phraseanet
     environment:
@@ -78,6 +79,7 @@ services:
     - ${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_PLUGINS_DIR}:/var/alchemy/Phraseanet/www/plugins:rw
     - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
     - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
 
@@ -169,10 +171,12 @@ volumes:
     driver: local
   custom_vol:
     driver: local
+  plugins_dir:
+    driver: local
   cache_vol:
     driver: local
   # to be replacer by stdout/stderr
   logs_vol:
     driver: local
   dev_vol:
-    driver: local
+    driver: local

docker/phraseanet/entrypoint.sh

@@ -55,7 +55,7 @@ chown -R app:app \
     datas \
     tmp \
     logs \
-    www/thumbnails \
-    www/custom
+    www \
+    plugins/
 
 bash -e docker-php-entrypoint $@