Преглед изворни кода

add portail_v2 docker conf & env

Maha Bouchiba пре 2 година
родитељ
комит
7ea5865b52
4 измењених фајлова са 69 додато и 21 уклоњено
  1. 5 1
      .env.skeleton
  2. 43 20
      docker-compose.yml
  3. 6 0
      docker/nginx-proxy/certs/ssl_keys.sh
  4. 15 0
      docker/portail_v2/Dockerfile

+ 5 - 1
.env.skeleton

@@ -1,5 +1,5 @@
 #OS : MAC ou LINUX
-OS=MAC
+OS=LINUX
 
 #Composer hash for instal (check validity here : https://getcomposer.org/download/)
 COMPOSER_HASH=756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3
@@ -43,6 +43,10 @@ FRAMES_REPORT_PORT=3005
 FRAMES_V3_VIRTUAL_HOST=local.frames_v3.opentalent.fr
 FRAMES_V3_PORT=3000
 
+#PORTAIL-V2
+PORTAIL_V2_VIRTUAL_HOST=local.portail-v2.opentalent.fr
+PORTAIL_V2_PORT=3000
+
 #V59
 V59_VIRTUAL_HOST=local.v59.opentalent.fr
 

+ 43 - 20
docker-compose.yml

@@ -309,6 +309,29 @@ services:
     depends_on:
       - nginx
 
+  portail_v2:
+    hostname: portail_v2
+    container_name: portail_v2
+    build:
+      context: .
+      dockerfile: docker/portail_v2/Dockerfile
+    volumes:
+      - ./apps/portail_v2:/home/workspace:rw,cached
+    tty: true
+    ports:
+      - 3010:3000
+      - 24680:24680
+    environment:
+      - VIRTUAL_HOST=${PORTAIL_V2_VIRTUAL_HOST}
+      - VIRTUAL_PORT=${PORTAIL_V2_PORT}
+      - NODE_ENV=development
+      - HTTPS_METHOD=noredirect
+    networks:
+      network:
+        ipv4_address: 172.20.2.6
+    depends_on:
+      - nginx_new
+
   typo3:
     hostname: typo3
     container_name: typo3
@@ -339,26 +362,26 @@ services:
     depends_on:
       - nginx
 
-  adminassos:
-    hostname: v59
-    container_name: adminassos
-    build:
-      context: .
-      dockerfile: docker/adminassos/Dockerfile
-      args:
-        - OS=${OS}
-    restart: always
-    volumes:
-      - ./apps/opentalent:/var/source/opentalent:cached
-      - useruploaddata:/var/www/opentalent/fileadmin/user_upload:cached
-      - ./apps/vendor:/var/source/vendor:delegated
-      - ./apps/opentalent-config:/var/source/config:cached
-    environment:
-      - VIRTUAL_HOST=${V59_VIRTUAL_HOST}
-    networks:
-      - network
-    depends_on:
-      - nginx
+  # adminassos:
+  #   hostname: v59
+  #   container_name: adminassos
+  #   build:
+  #     context: .
+  #     dockerfile: docker/adminassos/Dockerfile
+  #     args:
+  #       - OS=${OS}
+  #   restart: always
+  #   volumes:
+  #     - ./apps/opentalent:/var/source/opentalent:cached
+  #     - useruploaddata:/var/www/opentalent/fileadmin/user_upload:cached
+  #     - ./apps/vendor:/var/source/vendor:delegated
+  #     - ./apps/opentalent-config:/var/source/config:cached
+  #   environment:
+  #     - VIRTUAL_HOST=${V59_VIRTUAL_HOST}
+  #   networks:
+  #     - network
+  #   depends_on:
+  #     - nginx
 
   metabase:
     hostname: metabase

+ 6 - 0
docker/nginx-proxy/certs/ssl_keys.sh

@@ -58,9 +58,15 @@ cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.app-doc.o
 cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.frames.opentalent.fr.key
 cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.frames.opentalent.fr.crt
 
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.frames_v3.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.frames_v3.opentalent.fr.crt
+
 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
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.portail_v2.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.portail_v2.opentalent.fr.crt
 #docker-compose build --no-cache nginx-proxy

+ 15 - 0
docker/portail_v2/Dockerfile

@@ -0,0 +1,15 @@
+    # Pull base image.
+FROM node:18.10-buster
+
+ENV WORKDIR /home/workspace
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+
+RUN apt-get update && apt-get install -y g++ build-essential yarn
+
+# Define working directory.
+WORKDIR ${WORKDIR}
+
+CMD node