ソースを参照

delete thumbord and install imagick on ap2i

Vincent 2 年 前
コミット
4d637f48e0
4 ファイル変更42 行追加60 行削除
  1. 0 3
      .env.skeleton
  2. 0 3
      docker-compose-osx.yml
  3. 39 54
      docker-compose.yml
  4. 3 0
      docker/ap2i/Dockerfile

+ 0 - 3
.env.skeleton

@@ -59,9 +59,6 @@ PHPMYADMIN_VIRTUAL_HOST=local.phpmyadmin.opentalent.fr
 MAILCATCHER_VIRTUAL_HOST=local.mailcatcher.opentalent.fr
 MAILCATCHER_PORT=1080
 
-#THUMBOR
-THUMBOR_VIRTUAL_HOST=local.thumbor.opentalent.fr
-
 #Black Fire
 BLACKFIRE_CLIENT_ID=988fcba8-552d-48df-a9c2-035c76535b69
 BLACKFIRE_CLIENT_TOKEN=8cfbeb263d044da9678dc2612531504da3790c308da7448e35724a5da91c136f

+ 0 - 3
docker-compose-osx.yml

@@ -27,9 +27,6 @@ services:
   phpmyadmin:
     platform: linux/amd64
 
-  thumbor:
-    platform: linux/amd64
-
   frames_v3:
     volumes:
       - frame-v3-code:/home/workspace

+ 39 - 54
docker-compose.yml

@@ -9,8 +9,8 @@ services:
       dockerfile: docker/nginx-proxy/Dockerfile
     restart: always
     ports:
-      - 80:80
-      - 443:443
+      - "80:80"
+      - "443:443"
     environment:
       TRUST_DOWNSTREAM_PROXY: true
     networks:
@@ -80,7 +80,6 @@ services:
     depends_on:
       - db
       - es
-      - thumbor
       - nginx-proxy
 
   nginx_new:
@@ -122,7 +121,6 @@ services:
     depends_on:
       - db
       - es
-      - thumbor
       - nginx-proxy
 
   mercure:
@@ -333,26 +331,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
@@ -390,19 +388,6 @@ services:
     networks:
       - network
 
-  thumbor:
-    hostname: thumbor
-    container_name: thumbor
-    image: minimalcompact/thumbor
-    restart: always
-    environment:
-      - VIRTUAL_HOST=${THUMBOR_VIRTUAL_HOST}
-      - LOADER=thumbor.loaders.file_loader
-    networks:
-      - network
-    #    volumes:
-    #      - ./apps/opentalent-platform/web/files:/data/loader:cached
-
   phpmyadmin:
     hostname: phpmyadmin
     container_name: phpmyadmin
@@ -437,23 +422,23 @@ 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}
-    networks:
-      - network
-    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}
+#    networks:
+#      - network
+#    depends_on:
+#      - php70
+#      - ap2i
 
   phpdoc:
     hostname: phpdoc

+ 3 - 0
docker/ap2i/Dockerfile

@@ -66,6 +66,9 @@ RUN     docker-php-ext-install zip
 RUN     docker-php-ext-install xsl
         ## APCU
 RUN     pecl install apcu-5.1.21
+RUN     pecl install imagick
+RUN     docker-php-ext-install imagick
+
 ## COMPOSER
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
     php composer-setup.php; \