|
|
@@ -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
|