|
@@ -17,22 +17,6 @@ services:
|
|
|
MYSQL_USER: "${DB_USERNAME}"
|
|
|
MYSQL_PASSWORD: "${DB_PASSWORD}"
|
|
|
|
|
|
- # mysql-legacy:
|
|
|
- # image: mariadb:latest
|
|
|
- # volumes:
|
|
|
- # - db-data-legacy:/var/lib/mysql
|
|
|
- # - ./Docker/mysql/mysql.cnf:/etc/mysql/conf.d/custom.cnf:ro
|
|
|
- # - ./Docker/mysql/bashrc:/root/.bashrc:ro
|
|
|
- # - "${DB_IMPORTE_FILE_D7}:/docker-entrypoint-initdb.d/materio_d7.sql"
|
|
|
- # networks:
|
|
|
- # - database
|
|
|
- # hostname: mysql-legacy
|
|
|
- # environment:
|
|
|
- # MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"
|
|
|
- # MYSQL_DATABASE: "${DB_LEGACY_NAME}"
|
|
|
- # MYSQL_USER: "${DB_USERNAME}"
|
|
|
- # MYSQL_PASSWORD: "${DB_PASSWORD}"
|
|
|
-
|
|
|
redis:
|
|
|
image: redis:4
|
|
|
volumes:
|
|
@@ -42,37 +26,6 @@ services:
|
|
|
ports:
|
|
|
- "6389"
|
|
|
|
|
|
- # redis-legacy:
|
|
|
- # image: redis:3
|
|
|
- # volumes:
|
|
|
- # - redis-legacy-data:/data
|
|
|
- # networks:
|
|
|
- # - redis
|
|
|
- # ports:
|
|
|
- # - "6388"
|
|
|
-
|
|
|
- solr-new:
|
|
|
- build: ./Docker/solr/
|
|
|
- environment:
|
|
|
- - SOLR_HOME=/opt/solr/server/solr
|
|
|
- volumes:
|
|
|
- - "${SOLR_CORES}:/opt/solr/server/solr"
|
|
|
- # - solr-cores:/opt/solr/server/solr
|
|
|
- networks:
|
|
|
- - solr
|
|
|
- ports:
|
|
|
- - 8985:8983
|
|
|
-
|
|
|
- # solr-legacy:
|
|
|
- # build: ./Docker/solr-legacy/
|
|
|
- # volumes:
|
|
|
- # - solr-cores-legacy:/opt/solr/server/solr
|
|
|
- # networks:
|
|
|
- # - solr
|
|
|
- # ports:
|
|
|
- # - 8983:8983
|
|
|
-
|
|
|
-
|
|
|
php:
|
|
|
build: ./Docker/php/
|
|
|
expose:
|
|
@@ -87,31 +40,9 @@ services:
|
|
|
- database
|
|
|
- redis
|
|
|
- server
|
|
|
- - solr
|
|
|
depends_on:
|
|
|
- mysql
|
|
|
- # - mysql-legacy
|
|
|
- redis
|
|
|
- - solr-new
|
|
|
-
|
|
|
- # php-legacy:
|
|
|
- # build: ./Docker/php-legacy/
|
|
|
- # expose:
|
|
|
- # - 9000
|
|
|
- # volumes:
|
|
|
- # - php-legacy-root-data:/root
|
|
|
- # - "${LEGACY_ROOT}:/var/www/html"
|
|
|
- # - "${LOG_ROOT}/php-legacy:/var/log:rw"
|
|
|
- # working_dir: "/var/www/html"
|
|
|
- # networks:
|
|
|
- # - database
|
|
|
- # - redis
|
|
|
- # - server
|
|
|
- # - solr
|
|
|
- # depends_on:
|
|
|
- # - mysql-legacy
|
|
|
- # - redis-legacy
|
|
|
- # - solr-legacy
|
|
|
|
|
|
phpmyadmin:
|
|
|
image: phpmyadmin/phpmyadmin
|
|
@@ -121,7 +52,7 @@ services:
|
|
|
- database
|
|
|
depends_on:
|
|
|
- mysql
|
|
|
- # - mysql-legacy
|
|
|
+ - php
|
|
|
environment:
|
|
|
PMA_HOSTS: mysql
|
|
|
|
|
@@ -131,7 +62,6 @@ services:
|
|
|
- 8890:80
|
|
|
volumes:
|
|
|
- "${PROJECT_ROOT}:/var/www/html/drupald8.net/public_html"
|
|
|
- # - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
|
|
|
- "${LOG_ROOT}:/var/log:rw"
|
|
|
working_dir: "/var/www/html/drupald8.com/public_html"
|
|
|
networks:
|
|
@@ -140,32 +70,12 @@ services:
|
|
|
depends_on:
|
|
|
- php
|
|
|
|
|
|
- # nginx-legacy:
|
|
|
- # build: ./Docker/nginx-legacy/
|
|
|
- # ports:
|
|
|
- # - 8880:80
|
|
|
- # volumes:
|
|
|
- # - "${LEGACY_ROOT}:/var/www/html"
|
|
|
- # - "${LOG_ROOT}:/var/log:rw"
|
|
|
- # networks:
|
|
|
- # - server
|
|
|
- # - solr
|
|
|
- # depends_on:
|
|
|
- # - php-legacy
|
|
|
-
|
|
|
-
|
|
|
volumes:
|
|
|
php-root-data:
|
|
|
- # php-legacy-root-data:
|
|
|
db-data:
|
|
|
- # db-data-legacy:
|
|
|
redis-data:
|
|
|
- # redis-legacy-data:
|
|
|
- # solr-cores-legacy:
|
|
|
- solr-cores:
|
|
|
|
|
|
networks:
|
|
|
database:
|
|
|
redis:
|
|
|
server:
|
|
|
- solr:
|