浏览代码

maestro project

Maha Bouchiba 2 年之前
父节点
当前提交
f16c80ec35
共有 5 个文件被更改,包括 109 次插入24 次删除
  1. 2 2
      .env.skeleton
  2. 20 20
      docker-compose.yml
  3. 5 2
      docker/frames_v3/Dockerfile
  4. 79 0
      docker/maestro/Dockerfile
  5. 3 0
      docker/nginx-proxy/certs/ssl_keys.sh

+ 2 - 2
.env.skeleton

@@ -43,8 +43,8 @@ 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
+PORTAIL_V2_VIRTUAL_HOST=local.portail_v2.opentalent.fr
 PORTAIL_V2_PORT=3000
 
 #V59

+ 20 - 20
docker-compose.yml

@@ -363,26 +363,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

+ 5 - 2
docker/frames_v3/Dockerfile

@@ -1,14 +1,17 @@
-    # 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
+    && 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
 
+# Cypress requirements (https://docs.cypress.io/guides/getting-started/installing-cypress#Ubuntu-Debian)
+RUN apt-get update && apt-get install -y --fix-missing libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 \
+                       libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+
 # Define working directory.
 WORKDIR ${WORKDIR}
 

+ 79 - 0
docker/maestro/Dockerfile

@@ -0,0 +1,79 @@
+# ./docker/php/Dockerfile
+FROM php:8.2.1-fpm
+
+ARG COMPOSER_HASH
+ARG OS
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --fix-missing \
+    apt-utils \
+    gnupg
+
+## Si erreur de PUBKEY :
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
+
+RUN echo "deb https://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
+RUN echo "deb-src https://packages.dotdeb.org jessie all" >> /etc/apt/sources.list
+
+RUN apt-get clean
+RUN apt-get update
+RUN apt-get install --fix-missing --no-install-recommends -y \
+          zlib1g-dev libicu-dev g++ \
+          libjpeg62-turbo-dev \
+          libzip-dev \
+          libpng-dev \
+          libtidy-dev \
+          libssl-dev \
+          libxslt-dev \
+          libxrender-dev  \
+          libxrender1 \
+          libxt6 \
+          libxtst6 \
+          openssh-server \
+          build-essential \
+          xorg \
+          iputils-ping \
+          wget \
+          gdebi \
+          ca-certificates \
+          wget \
+          xz-utils \
+          fontconfig \
+          git \
+          nano \
+          acl \
+          procps \
+          libmagickwand-dev \
+          imagemagick \
+          zip
+
+RUN     docker-php-ext-configure intl \
+        && docker-php-ext-install  \
+            intl  \
+            opcache  \
+            pdo_mysql \
+            exif \
+            bcmath  \
+            calendar  \
+            gd  \
+            tidy
+RUN     docker-php-ext-enable intl
+RUN     docker-php-ext-enable exif
+RUN     docker-php-ext-enable tidy
+RUN     docker-php-ext-install zip
+RUN     docker-php-ext-install xsl
+
+        ## APCU
+RUN     pecl install apcu-5.1.21
+
+## COMPOSER
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
+    php composer-setup.php; \
+    php -r "unlink('composer-setup.php');"; \
+    mv composer.phar /usr/local/bin/composer
+
+
+## Create .env.local file
+RUN echo "APP_ENV=docker" > .env.local
+
+WORKDIR /var/www/html

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

@@ -69,4 +69,7 @@ cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.app-v3.op
 
 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
+
+cp docker/nginx-proxy/certs/default.key docker/nginx-proxy/certs/local.maestro.opentalent.fr.key
+cp docker/nginx-proxy/certs/default.crt docker/nginx-proxy/certs/local.maestro.opentalent.fr.crt
 #docker-compose build --no-cache nginx-proxy