deactivated legacy, updated php to 8.1, misc

This commit is contained in:
2025-03-21 15:31:18 +01:00
parent 70f5e01793
commit 43fd5dae4b
8 changed files with 194 additions and 81 deletions
+71 -71
View File
@@ -17,21 +17,21 @@ 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}"
# 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
@@ -44,16 +44,16 @@ services:
ports:
- "6389"
redis-legacy:
image: redis:3
command: redis-server /usr/local/etc/redis.conf
volumes:
- redis-legacy-data:/data
- ./Docker/redis/redis.conf:/usr/local/etc/redis.conf
networks:
- redis
ports:
- "6388"
# redis-legacy:
# image: redis:3
# command: redis-server /usr/local/etc/redis.conf
# volumes:
# - redis-legacy-data:/data
# - ./Docker/redis/redis.conf:/usr/local/etc/redis.conf
# networks:
# - redis
# ports:
# - "6388"
solr-new:
build: ./Docker/solr/
@@ -73,14 +73,14 @@ services:
ports:
- 8985:8983
solr-legacy:
build: ./Docker/solr-legacy/
volumes:
- solr-cores-legacy:/opt/solr/server/solr
networks:
- solr
ports:
- 8983:8983
# solr-legacy:
# build: ./Docker/solr-legacy/
# volumes:
# - solr-cores-legacy:/opt/solr/server/solr
# networks:
# - solr
# ports:
# - 8983:8983
php:
@@ -109,28 +109,28 @@ services:
# mem_limit: 512m
depends_on:
- mysql
- mysql-legacy
# - 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
# 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
@@ -140,9 +140,9 @@ services:
- database
depends_on:
- mysql
- mysql-legacy
# - mysql-legacy
environment:
PMA_HOSTS: mysql,mysql-legacy
PMA_HOSTS: mysql #,mysql-legacy
nginx:
build: ./Docker/nginx/
@@ -150,7 +150,7 @@ services:
- 8890:80
volumes:
- "${PROJECT_ROOT}:/var/www/html/d8.materio.com/public_html"
- "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
# - "${LEGACY_ROOT}:/var/www/html/d7.materio.com/public_html"
- "${LOG_ROOT}:/var/log:rw"
working_dir: "/var/www/html/d8.materio.com/public_html"
networks:
@@ -159,18 +159,18 @@ 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
# 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
npm:
build: ./Docker/npm
@@ -189,12 +189,12 @@ services:
volumes:
php-user-data:
php-legacy-root-data:
# php-legacy-root-data:
db-data:
db-data-legacy:
# db-data-legacy:
redis-data:
redis-legacy-data:
solr-cores-legacy:
# redis-legacy-data:
# solr-cores-legacy:
# solr-cores:
npm-user-data: