Merge branch 'master' into PHRAS-3474-mapping-client-annotation

.env

@@ -246,10 +246,10 @@ BLACKFIRE_SERVER_TOKEN=
 # for dev export ftp
 PHRASEANET_FTP_DIR=./datas/ftp
 
-# for dev proxy squid
-PHRASEANET_SQUID_DIR=./volumes/squid
-PHRASEANET_SQUID_CONF= ./docker/squid/squid.conf
-PHRASEANET_SQUID_PORT=3128
+# for dev proxy squid WIP 
+# PHRASEANET_SQUID_DIR=./volumes/squid
+# PHRASEANET_SQUID_CONF= ./docker/squid/squid.conf
+# PHRASEANET_SQUID_PORT=3128
 
 
 # For dev who don't have SSH_AUTH_SOCK (avoid an empty volume name)

.gitignore

@@ -64,16 +64,25 @@ behat.yml
 # Exclude crossdomain.xml file it's generated
 /www/crossdomain.xml
 
-# Exclude jison files
+# Exclude json files
 grammar/query.js
 grammar/jison-*
 
+
 pimple.json
 playbook.retry
 npm-debug.log
 
+# Exclude stack datas
 /Phrasea_datas
+/volumes
 
+# Exclude alternate env files
 .env.*
 env.local
-/volumes
+
+# Exclude gitlog files
+www/gitlog.txt
+
+
+

docker-compose.yml

@@ -195,7 +195,7 @@ services:
       - internal
 
   rabbitmq:
-    image: rabbitmq:3-management
+    image: rabbitmq:3.6.16-management
     restart: on-failure
     environment:
     - RABBITMQ_DEFAULT_USER