From eff0560697e5843084bfe975e08dda673576d434 Mon Sep 17 00:00:00 2001 From: Mattias Michaux Date: Tue, 9 Jan 2024 22:02:58 +0100 Subject: [PATCH] make loading test data and running migrations configurable --- apache/Dockerfile | 4 +++- common/entrypoint_mautic_web.sh | 5 +++++ examples/basic/.env | 2 ++ examples/basic/docker-compose.yml | 3 ++- examples/fpm-nginx/.env | 2 ++ examples/fpm-nginx/docker-compose.yml | 2 ++ examples/rabbitmq-worker/.env | 2 ++ examples/rabbitmq-worker/docker-compose.yml | 2 ++ fpm/Dockerfile | 4 +++- 9 files changed, 23 insertions(+), 3 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index fe30876..9eadb62 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -115,7 +115,9 @@ VOLUME /var/www/html/docroot/media WORKDIR /var/www/html/docroot -ENV MAUTIC_ROLE=mautic_web +ENV MAUTIC_ROLE=mautic_web \ + MAUTIC_RUN_MIGRATIONS=false \ + MAUTIC_LOAD_TEST_DATA=false ENTRYPOINT ["/entrypoint.sh"] diff --git a/common/entrypoint_mautic_web.sh b/common/entrypoint_mautic_web.sh index 902fa95..5d17219 100644 --- a/common/entrypoint_mautic_web.sh +++ b/common/entrypoint_mautic_web.sh @@ -36,5 +36,10 @@ if [ "$MAUTIC_LOAD_TEST_DATA" = "true" ]; then su -s /bin/bash www-data -c 'php /var/www/html/bin/console doctrine:fixtures:load -n' fi +# run migrations +if [ "$MAUTIC_RUN_MIGRATIONS" = "true" ]; then + su -s /bin/bash www-data -c 'php /var/www/html/bin/console doctrine:migration:migrate -n' +fi + # execute the provided entrypoint "$@" diff --git a/examples/basic/.env b/examples/basic/.env index 7232238..3bd1670 100644 --- a/examples/basic/.env +++ b/examples/basic/.env @@ -4,3 +4,5 @@ MYSQL_ROOT_PASSWORD=changeme MYSQL_DATABASE=mautic_db MYSQL_USER=mautic_db_user MYSQL_PASSWORD=mautic_db_pwd +MAUTIC_RUN_MIGRATIONS=false +MAUTIC_LOAD_TEST_DATA=false diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml index 4b351c6..f42ad8d 100644 --- a/examples/basic/docker-compose.yml +++ b/examples/basic/docker-compose.yml @@ -34,7 +34,8 @@ services: volumes: *mautic-volumes environment: - - MAUTIC_LOAD_TEST_DATA=true + - MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA} + - MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS} - MYSQL_HOST=${MYSQL_HOST} - MYSQL_PORT=${MYSQL_PORT} - MYSQL_DATABASE=${MYSQL_DATABASE} diff --git a/examples/fpm-nginx/.env b/examples/fpm-nginx/.env index 7232238..3bd1670 100644 --- a/examples/fpm-nginx/.env +++ b/examples/fpm-nginx/.env @@ -4,3 +4,5 @@ MYSQL_ROOT_PASSWORD=changeme MYSQL_DATABASE=mautic_db MYSQL_USER=mautic_db_user MYSQL_PASSWORD=mautic_db_pwd +MAUTIC_RUN_MIGRATIONS=false +MAUTIC_LOAD_TEST_DATA=false diff --git a/examples/fpm-nginx/docker-compose.yml b/examples/fpm-nginx/docker-compose.yml index 07f5630..52b66be 100644 --- a/examples/fpm-nginx/docker-compose.yml +++ b/examples/fpm-nginx/docker-compose.yml @@ -43,6 +43,8 @@ services: volumes: *mautic-volumes environment: + - MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA} + - MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS} - MAUTIC_LOAD_TEST_DATA=true - MYSQL_HOST=${MYSQL_HOST} - MYSQL_PORT=${MYSQL_PORT} diff --git a/examples/rabbitmq-worker/.env b/examples/rabbitmq-worker/.env index 7232238..3bd1670 100644 --- a/examples/rabbitmq-worker/.env +++ b/examples/rabbitmq-worker/.env @@ -4,3 +4,5 @@ MYSQL_ROOT_PASSWORD=changeme MYSQL_DATABASE=mautic_db MYSQL_USER=mautic_db_user MYSQL_PASSWORD=mautic_db_pwd +MAUTIC_RUN_MIGRATIONS=false +MAUTIC_LOAD_TEST_DATA=false diff --git a/examples/rabbitmq-worker/docker-compose.yml b/examples/rabbitmq-worker/docker-compose.yml index 4cf0d7d..9d181eb 100644 --- a/examples/rabbitmq-worker/docker-compose.yml +++ b/examples/rabbitmq-worker/docker-compose.yml @@ -39,6 +39,8 @@ services: volumes: *mautic-volumes environment: + - MAUTIC_LOAD_TEST_DATA=${MAUTIC_LOAD_TEST_DATA} + - MAUTIC_RUN_MIGRATIONS=${MAUTIC_RUN_MIGRATIONS} - MAUTIC_LOAD_TEST_DATA=true - MYSQL_HOST=${MYSQL_HOST} - MYSQL_PORT=${MYSQL_PORT} diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 22e2488..00d57c8 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -107,7 +107,9 @@ VOLUME /var/www/html/docroot/media WORKDIR /var/www/html/docroot -ENV MAUTIC_ROLE=mautic_web +ENV MAUTIC_ROLE=mautic_web \ + MAUTIC_RUN_MIGRATIONS=false \ + MAUTIC_LOAD_TEST_DATA=false ENTRYPOINT ["/entrypoint.sh"]