Merge branch 'master' of git@gitlab.2iopenservice.com:opentalent/docker.git

.env.skeleton

@@ -77,3 +77,6 @@ MERCURE_PUBLIC_URL=https://local.mercure.opentalent.fr/.well-known/mercure
 MERCURE_PUBLISHER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
 MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
 
+#App-V3
+APP_V3_VIRTUAL_HOST=local.app-v3.opentalent.fr
+APP_V3_PORT=3004

docker-compose.yml

@@ -186,6 +186,26 @@ services:
     depends_on:
       - nginx_new
 
+  app_v3:
+    hostname: app_v3
+    container_name: app_v3
+    build:
+      context: .
+      dockerfile: docker/app/Dockerfile
+    volumes:
+      - ./apps/app-v3:/home/workspace:rw,cached
+    tty: true
+    ports:
+      - 3004:3000
+      - 24678:24678
+    environment:
+      - VIRTUAL_HOST=${APP_V3_VIRTUAL_HOST}
+      - VIRTUAL_PORT=${APP_REPORT_PORT}
+      - NODE_ENV=development
+      - HTTPS_METHOD=noredirect
+    depends_on:
+      - nginx_new
+
   frames:
     hostname: frames
     container_name: frames
@@ -282,18 +302,18 @@ services:
     depends_on:
       - nginx
 
-#  metabase:
-#    hostname: metabase
-#    image: metabase/metabase
-#    restart: always
-#    volumes:
-#      - ./metabase-data:/metabase-data
-#    environment:
-##      - MB_DB_FILE=./metabase-data/metabase.db
-#      - VIRTUAL_HOST=${METABASE_VIRTUAL_HOST}
-#      - VIRTUAL_PORT=${METABASE_PORT}
-#    depends_on:
-#      - db
+  metabase:
+    hostname: metabase
+    image: metabase/metabase
+    restart: always
+    volumes:
+      - ./metabase-data:/metabase-data
+    environment:
+#      - MB_DB_FILE=./metabase-data/metabase.db
+      - VIRTUAL_HOST=${METABASE_VIRTUAL_HOST}
+      - VIRTUAL_PORT=${METABASE_PORT}
+    depends_on:
+      - db
 
   es:
     hostname: es
@@ -355,40 +375,40 @@ services:
     depends_on:
       - nginx-proxy
 
-#  blackfire:
-#    hostname: blackfire
-#    container_name: blackfire
-#    image: blackfire/blackfire
-#    environment:
-#      - BLACKFIRE_LOG_LEVEL=4
-#      - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
-#      - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
-#      - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
-#      - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
-#      - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
-#      - VIRTUAL_PORT=${BLACK_FIRE_PORT}
-#    depends_on:
-#      - php70
-#      - ap2i
+  blackfire:
+    hostname: blackfire
+    container_name: blackfire
+    image: blackfire/blackfire
+    environment:
+      - BLACKFIRE_LOG_LEVEL=4
+      - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
+      - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
+      - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
+      - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
+      - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
+      - VIRTUAL_PORT=${BLACK_FIRE_PORT}
+    depends_on:
+      - php70
+      - ap2i
 
-#  phpdoc:
-#    hostname: phpdoc
-#    container_name: phpdoc
-#    image: nginx:alpine
-#    volumes:
-#      - ./apps/api-doc:/usr/share/nginx/html
-#    environment:
-#      - VIRTUAL_HOST=${PHPDOC_VIRTUAL_HOST}
-#    #docker run --rm -v /opt/opentalent/apps/api/src/:/data -v /opt/opentalent/apps/api-doc:/output phpdoc/phpdoc -d /data -t /output
-#
-#  jsdoc:
-#    hostname: jsdoc
-#    container_name: jsdoc
-#    image: nginx:alpine
-#    volumes:
-#      - ./apps/admin-doc:/usr/share/nginx/html
-#    environment:
-#      - VIRTUAL_HOST=${JSDOC_VIRTUAL_HOST}
+  phpdoc:
+    hostname: phpdoc
+    container_name: phpdoc
+    image: nginx:alpine
+    volumes:
+      - ./apps/api-doc:/usr/share/nginx/html
+    environment:
+      - VIRTUAL_HOST=${PHPDOC_VIRTUAL_HOST}
+    #docker run --rm -v /opt/opentalent/apps/api/src/:/data -v /opt/opentalent/apps/api-doc:/output phpdoc/phpdoc -d /data -t /output
+
+  jsdoc:
+    hostname: jsdoc
+    container_name: jsdoc
+    image: nginx:alpine
+    volumes:
+      - ./apps/admin-doc:/usr/share/nginx/html
+    environment:
+      - VIRTUAL_HOST=${JSDOC_VIRTUAL_HOST}
 
 volumes:
   mysqldata: ~

docker/nginx-proxy/certs/ssl_keys.sh

@@ -61,4 +61,6 @@ cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.frames.op
 cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.mercure.opentalent.fr.key
 cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.mercure.opentalent.fr.crt
 
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.app-v3.opentalent.fr.crt
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.app-v3.opentalent.fr.key
 #docker-compose build --no-cache nginx-proxy