merge conflict

.env.skeleton

@@ -2,7 +2,7 @@
 OS=MAC
 
 #Composer hash for instal (check validity here : https://getcomposer.org/download/)
-COMPOSER_HASH=756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3
+COMPOSER_HASH=e5325b19b381bfd88ce90a5ddb7823406b2a38cff6bb704b0acc289a09c8128d4a8ce2bbafcd1fcbdc38666422fe2806
 
 #LetsEncrypt
 EMAIL=vincent.guffon@2iopenservice.com
@@ -15,13 +15,18 @@ ES_VIRTUAL_HOST=local.elasticsearch.opentalent.fr
 ES_PORT=9200
 
 #API
-API_VIRTUAL_HOST=local.api.opentalent.fr
+API_VIRTUAL_HOST=local.api.opentalent.fr,local.new.api.opentalent.fr
 
 #ADMIN
 ADMIN_VIRTUAL_HOST=local.admin.opentalent.fr
 ADMIN_PORT=3000
 ADMIN_REPORT_PORT=3001
 
+#ADMIN2
+ADMIN2_VIRTUAL_HOST=local.admin2.opentalent.fr
+ADMIN2_PORT=3002
+ADMIN2_REPORT_PORT=3003
+
 #PORTAIL
 PORTAIL_VIRTUAL_HOST=local.opentalent.fr
 
@@ -42,11 +47,13 @@ MAILCATCHER_PORT=1080
 THUMBOR_VIRTUAL_HOST=local.thumbor.opentalent.fr
 
 #Black Fire
-BLACK_FIRE_ID=97e9ee98-0703-478e-a298-6320bd432393
-BLACK_FIRE_TOKEN=31c026c1ee937f59834cec4da0d019d946ce3e3dd02119ab621e59d1b52a20e9
+BLACKFIRE_CLIENT_ID=988fcba8-552d-48df-a9c2-035c76535b69
+BLACKFIRE_CLIENT_TOKEN=8cfbeb263d044da9678dc2612531504da3790c308da7448e35724a5da91c136f
+BLACKFIRE_SERVER_ID=1171e53b-459b-41da-a292-80ff68cee8c2
+BLACKFIRE_SERVER_TOKEN=dbd1cfbea015fe83cccfc189a36ca3c16f3a1b43b94f50032a15e41e53548e8b
 BLACK_FIRE_VIRTUAL_HOST=local.blackfire.opentalent.fr
 BLACK_FIRE_PORT=8707
 
 #Metabase
 METABASE_VIRTUAL_HOST=local.metabase.opentalent.fr
-METABASE_PORT=3000
+METABASE_PORT=3000

docker-compose.yaml

@@ -292,7 +292,7 @@ services:
       - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
       - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
       - VIRTUAL_PORT=${BLACK_FIRE_PORT}
-    depends
+    depends_on:
       - php70
       - php74