cleaned docker-compose

This commit is contained in:
2019-07-11 16:33:11 +02:00
parent e8faeb3e0f
commit 1d78a64f70
+1 -91
View File
@@ -17,22 +17,6 @@ services:
MYSQL_USER: "${DB_USERNAME}" MYSQL_USER: "${DB_USERNAME}"
MYSQL_PASSWORD: "${DB_PASSWORD}" 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: redis:
image: redis:4 image: redis:4
volumes: volumes:
@@ -42,37 +26,6 @@ services:
ports: ports:
- "6389" - "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: php:
build: ./Docker/php/ build: ./Docker/php/
expose: expose:
@@ -87,31 +40,9 @@ services:
- database - database
- redis - redis
- server - server
- solr
depends_on: depends_on:
- mysql - mysql
# - mysql-legacy
- redis - 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: phpmyadmin:
image: phpmyadmin/phpmyadmin image: phpmyadmin/phpmyadmin
@@ -121,7 +52,7 @@ services:
- database - database
depends_on: depends_on:
- mysql - mysql
# - mysql-legacy - php
environment: environment:
PMA_HOSTS: mysql PMA_HOSTS: mysql
@@ -131,7 +62,6 @@ services:
- 8890:80 - 8890:80
volumes: volumes:
- "${PROJECT_ROOT}:/var/www/html/drupald8.net/public_html" - "${PROJECT_ROOT}:/var/www/html/drupald8.net/public_html"
# - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
- "${LOG_ROOT}:/var/log:rw" - "${LOG_ROOT}:/var/log:rw"
working_dir: "/var/www/html/drupald8.com/public_html" working_dir: "/var/www/html/drupald8.com/public_html"
networks: networks:
@@ -140,32 +70,12 @@ services:
depends_on: depends_on:
- php - 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: volumes:
php-root-data: php-root-data:
# php-legacy-root-data:
db-data: db-data:
# db-data-legacy:
redis-data: redis-data:
# redis-legacy-data:
# solr-cores-legacy:
solr-cores:
networks: networks:
database: database:
redis: redis:
server: server:
solr: