Merge branch 'master' into master
This commit is contained in:
@ -47,6 +47,10 @@ volumes:
|
||||
driver: ${VOLUMES_DRIVER}
|
||||
cassandra:
|
||||
driver: ${VOLUMES_DRIVER}
|
||||
graylog:
|
||||
driver: ${VOLUMES_DRIVER}
|
||||
dind:
|
||||
driver: ${VOLUMES_DRIVER}
|
||||
|
||||
services:
|
||||
|
||||
@ -55,6 +59,8 @@ services:
|
||||
build:
|
||||
context: ./workspace
|
||||
args:
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- UBUNTU_SOURCE=${UBUNTU_SOURCE}
|
||||
- LARADOCK_PHP_VERSION=${PHP_VERSION}
|
||||
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
|
||||
- INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
|
||||
@ -70,8 +76,10 @@ services:
|
||||
- INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
|
||||
- INSTALL_AMQP=${WORKSPACE_INSTALL_AMQP}
|
||||
- INSTALL_CASSANDRA=${WORKSPACE_INSTALL_CASSANDRA}
|
||||
- INSTALL_GEARMAN=${WORKSPACE_INSTALL_GEARMAN}
|
||||
- INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS}
|
||||
- INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL}
|
||||
- NVM_NODEJS_ORG_MIRROR=${WORKSPACE_NVM_NODEJS_ORG_MIRROR}
|
||||
- INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
|
||||
- NPM_REGISTRY=${WORKSPACE_NPM_REGISTRY}
|
||||
- INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
|
||||
@ -111,16 +119,21 @@ services:
|
||||
- INSTALL_SSHPASS=${WORKSPACE_INSTALL_SSHPASS}
|
||||
- INSTALL_INOTIFY=${WORKSPACE_INSTALL_INOTIFY}
|
||||
- INSTALL_FSWATCH=${WORKSPACE_INSTALL_FSWATCH}
|
||||
- INSTALL_AST=${WORKSPACE_INSTALL_AST}
|
||||
- INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
|
||||
- INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}
|
||||
- PUID=${WORKSPACE_PUID}
|
||||
- PGID=${WORKSPACE_PGID}
|
||||
- CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
|
||||
- NODE_VERSION=${WORKSPACE_NODE_VERSION}
|
||||
- YARN_VERSION=${WORKSPACE_YARN_VERSION}
|
||||
- DRUSH_VERSION=${WORKSPACE_DRUSH_VERSION}
|
||||
- AST_VERSION=${WORKSPACE_AST_VERSION}
|
||||
- TZ=${WORKSPACE_TIMEZONE}
|
||||
- BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
|
||||
- BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
|
||||
- INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
|
||||
- INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
|
||||
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
|
||||
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
|
||||
- http_proxy
|
||||
@ -128,6 +141,7 @@ services:
|
||||
- no_proxy
|
||||
volumes:
|
||||
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
|
||||
- ./php-worker/supervisord.d:/etc/supervisord.d
|
||||
extra_hosts:
|
||||
- "dockerhost:${DOCKER_HOST_IP}"
|
||||
ports:
|
||||
@ -147,6 +161,7 @@ services:
|
||||
build:
|
||||
context: ./php-fpm
|
||||
args:
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- LARADOCK_PHP_VERSION=${PHP_VERSION}
|
||||
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
|
||||
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
|
||||
@ -159,6 +174,7 @@ services:
|
||||
- INSTALL_MONGO=${PHP_FPM_INSTALL_MONGO}
|
||||
- INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP}
|
||||
- INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
|
||||
- INSTALL_GEARMAN=${PHP_FPM_INSTALL_GEARMAN}
|
||||
- INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
|
||||
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
|
||||
- INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
|
||||
@ -183,15 +199,21 @@ services:
|
||||
- INSTALL_FAKETIME=${PHP_FPM_INSTALL_FAKETIME}
|
||||
- INSTALL_IONCUBE=${PHP_FPM_INSTALL_IONCUBE}
|
||||
- INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
|
||||
- INSTALL_CACHETOOL=${PHP_FPM_INSTALL_CACHETOOL}
|
||||
- INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
|
||||
- INSTALL_RDKAFKA=${PHP_FPM_INSTALL_RDKAFKA}
|
||||
- INSTALL_GETTEXT=${PHP_FPM_INSTALL_GETTEXT}
|
||||
- INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
|
||||
- INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
|
||||
- INSTALL_PING=${PHP_FPM_INSTALL_PING}
|
||||
- INSTALL_SSHPASS=${PHP_FPM_INSTALL_SSHPASS}
|
||||
- INSTALL_MAILPARSE=${PHP_FPM_INSTALL_MAILPARSE}
|
||||
- INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
|
||||
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
|
||||
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
|
||||
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
|
||||
- PUID=${PHP_FPM_PUID}
|
||||
- PGID=${PHP_FPM_PGID}
|
||||
- http_proxy
|
||||
- https_proxy
|
||||
- no_proxy
|
||||
@ -218,6 +240,7 @@ services:
|
||||
build:
|
||||
context: ./php-worker
|
||||
args:
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- PHP_VERSION=${PHP_VERSION}
|
||||
- PHALCON_VERSION=${PHALCON_VERSION}
|
||||
- INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
|
||||
@ -228,11 +251,13 @@ services:
|
||||
- INSTALL_MYSQL_CLIENT=${PHP_WORKER_INSTALL_MYSQL_CLIENT}
|
||||
- INSTALL_AMQP=${PHP_WORKER_INSTALL_AMQP}
|
||||
- INSTALL_CASSANDRA=${PHP_WORKER_INSTALL_CASSANDRA}
|
||||
- INSTALL_GEARMAN=${PHP_WORKER_INSTALL_GEARMAN}
|
||||
- INSTALL_GHOSTSCRIPT=${PHP_WORKER_INSTALL_GHOSTSCRIPT}
|
||||
- INSTALL_SWOOLE=${PHP_WORKER_INSTALL_SWOOLE}
|
||||
- INSTALL_TAINT=${PHP_WORKER_INSTALL_TAINT}
|
||||
- INSTALL_FFMPEG=${PHP_WORKER_INSTALL_FFMPEG}
|
||||
- INSTALL_GMP=${PHP_WORKER_INSTALL_GMP}
|
||||
- INSTALL_REDIS=${PHP_WORKER_INSTALL_REDIS}
|
||||
- PUID=${PHP_WORKER_PUID}
|
||||
- PGID=${PHP_WORKER_PGID}
|
||||
volumes:
|
||||
@ -249,12 +274,15 @@ services:
|
||||
build:
|
||||
context: ./laravel-horizon
|
||||
args:
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- PHP_VERSION=${PHP_VERSION}
|
||||
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
|
||||
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
|
||||
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
|
||||
- INSTALL_SOCKETS=${LARAVEL_HORIZON_INSTALL_SOCKETS}
|
||||
- INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA}
|
||||
- INSTALL_PHPREDIS=${LARAVEL_HORIZON_INSTALL_PHPREDIS}
|
||||
- INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
|
||||
volumes:
|
||||
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
|
||||
- ./laravel-horizon/supervisord.d:/etc/supervisord.d
|
||||
@ -270,9 +298,9 @@ services:
|
||||
build:
|
||||
context: ./nginx
|
||||
args:
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- PHP_UPSTREAM_CONTAINER=${NGINX_PHP_UPSTREAM_CONTAINER}
|
||||
- PHP_UPSTREAM_PORT=${NGINX_PHP_UPSTREAM_PORT}
|
||||
- CHANGE_SOURCE=${CHANGE_SOURCE}
|
||||
- http_proxy
|
||||
- https_proxy
|
||||
- no_proxy
|
||||
@ -491,6 +519,7 @@ services:
|
||||
- "${MONGODB_PORT}:27017"
|
||||
volumes:
|
||||
- ${DATA_PATH_HOST}/mongo:/data/db
|
||||
- ${DATA_PATH_HOST}/mongo_config:/data/configdb
|
||||
networks:
|
||||
- backend
|
||||
|
||||
@ -625,6 +654,39 @@ services:
|
||||
networks:
|
||||
- backend
|
||||
|
||||
### Gearman ############################################
|
||||
gearman:
|
||||
build: ./gearman
|
||||
ports:
|
||||
- "${GEARMAN_PORT}:4730"
|
||||
privileged: true
|
||||
environment:
|
||||
- GEARMAN_VERSION=${GEARMAN_VERSION}
|
||||
- GEARMAN_VERBOSE=${GEARMAN_VERBOSE}
|
||||
- GEARMAN_QUEUE_TYPE=${GEARMAN_QUEUE_TYPE}
|
||||
- GEARMAN_THREADS=${GEARMAN_THREADS}
|
||||
- GEARMAN_BACKLOG=${GEARMAN_BACKLOG}
|
||||
- GEARMAN_FILE_DESCRIPTORS=${GEARMAN_FILE_DESCRIPTORS}
|
||||
- GEARMAN_JOB_RETRIES=${GEARMAN_JOB_RETRIES}
|
||||
- GEARMAN_ROUND_ROBIN=${GEARMAN_ROUND_ROBIN}
|
||||
- GEARMAN_WORKER_WAKEUP=${GEARMAN_WORKER_WAKEUP}
|
||||
- GEARMAN_KEEPALIVE=${GEARMAN_KEEPALIVE}
|
||||
- GEARMAN_KEEPALIVE_IDLE=${GEARMAN_KEEPALIVE_IDLE}
|
||||
- GEARMAN_KEEPALIVE_INTERVAL=${GEARMAN_KEEPALIVE_INTERVAL}
|
||||
- GEARMAN_KEEPALIVE_COUNT=${GEARMAN_KEEPALIVE_COUNT}
|
||||
- GEARMAN_MYSQL_HOST=${GEARMAN_MYSQL_HOST}
|
||||
- GEARMAN_MYSQL_PORT=${GEARMAN_MYSQL_PORT}
|
||||
- GEARMAN_MYSQL_USER=${GEARMAN_MYSQL_USER}
|
||||
- GEARMAN_MYSQL_PASSWORD=${GEARMAN_MYSQL_PASSWORD}
|
||||
- GEARMAN_MYSQL_PASSWORD_FILE=${GEARMAN_MYSQL_PASSWORD_FILE}
|
||||
- GEARMAN_MYSQL_DB=${GEARMAN_MYSQL_DB}
|
||||
- GEARMAN_MYSQL_TABLE=${GEARMAN_MYSQL_TABLE}
|
||||
hostname: laradock-gearman
|
||||
depends_on:
|
||||
- php-fpm
|
||||
networks:
|
||||
- backend
|
||||
|
||||
### Beanstalkd Console ###################################
|
||||
beanstalkd-console:
|
||||
build: ./beanstalkd-console
|
||||
@ -891,9 +953,9 @@ services:
|
||||
- ${GRAYLOG_GELF_TCP_PORT}:12201
|
||||
# GELF UDP
|
||||
- ${GRAYLOG_GELF_UDP_PORT}:12201/udp
|
||||
user: root
|
||||
user: graylog
|
||||
volumes:
|
||||
- ./graylog/config:/usr/share/graylog/data/config
|
||||
- ${DATA_PATH_HOST}/graylog:/usr/share/graylog/data
|
||||
networks:
|
||||
- backend
|
||||
|
||||
@ -1173,6 +1235,7 @@ services:
|
||||
privileged: true
|
||||
volumes:
|
||||
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
|
||||
- ${DATA_PATH_HOST}/dind:/var/lib/docker
|
||||
expose:
|
||||
- 2375
|
||||
networks:
|
||||
@ -1563,6 +1626,7 @@ services:
|
||||
networks:
|
||||
- backend
|
||||
- frontend
|
||||
|
||||
### CONFLUENCE ################################################
|
||||
confluence:
|
||||
container_name: Confluence
|
||||
@ -1577,3 +1641,18 @@ services:
|
||||
- postgres
|
||||
volumes:
|
||||
- ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
|
||||
|
||||
### tomcat ####################################################
|
||||
tomcat:
|
||||
container_name: tomcat
|
||||
image: tomcat:${TOMCAT_VERSION}
|
||||
ports:
|
||||
- "${TOMCAT_HOST_HTTP_PORT}:8080"
|
||||
networks:
|
||||
- frontend
|
||||
- backend
|
||||
volumes:
|
||||
- ${DATA_PATH_HOST}/tomcat/webapps:/usr/local/tomcat/webapps
|
||||
- ${DATA_PATH_HOST}/tomcat/logs:/usr/local/tomcat/logs
|
||||
# restart: always
|
||||
|
||||
|
Reference in New Issue
Block a user