diff --git a/.env b/.env index 9c50899..bfe417e 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ COMPOSE_PROJECT_NAME=edlpd8 PROJECT_ROOT=./public_html +LEGACY_ROOT=./drupal6 LOG_ROOT=./log DB_IMPORTE_FILE_D8=./ressources/edlp_d8.sql diff --git a/.gitignore b/.gitignore index 6cac38d..d7db69b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ public_html/* +drupal6/* log/* *.sql diff --git a/docker-compose.yml b/docker-compose.yml index a3eed59..eaa9419 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,21 @@ services: MYSQL_DATABASE: "${DB_NAME}" MYSQL_USER: "${DB_USERNAME}" MYSQL_PASSWORD: "${DB_PASSWORD}" + # + # mysql-legacy: + # image: mariadb:latest + # volumes: + # - db-legacy-data:/var/lib/mysql + # # - "${DB_IMPORTE_FILE_D8}:/docker-entrypoint-initdb.d/edlp_d8.sql" + # - "${DB_IMPORTE_FILE_D6}:/docker-entrypoint-initdb.d/edlp_d6.sql" + # networks: + # - database + # hostname: mysql-legacy + # environment: + # MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}" + # MYSQL_DATABASE: "${DB_NAME}" + # MYSQL_USER: "${DB_USERNAME}" + # MYSQL_PASSWORD: "${DB_PASSWORD}" redis: image: redis:4 @@ -31,6 +46,7 @@ services: - 9000 volumes: - "${PROJECT_ROOT}:/var/www/html" + - "${LEGACY_ROOT}:/var/www/drupal6" networks: - database - redis @@ -38,6 +54,7 @@ services: depends_on: - mysql - redis + # - mysql-legacy phpmyadmin: image: phpmyadmin/phpmyadmin diff --git a/drupal6/.keepme b/drupal6/.keepme new file mode 100644 index 0000000..e69de29 diff --git a/public_html b/public_html index cd7dea4..6fa79e7 160000 --- a/public_html +++ b/public_html @@ -1 +1 @@ -Subproject commit cd7dea45a9f51bd1d5eebaee2a3c03302e59f647 +Subproject commit 6fa79e76ca833be79d7cbdff22937758a26412a2