Merge pull request #434 from cibero42/fix-426

Fix Volume Persistance

Author: cibero42

README.md

@@ -122,7 +122,6 @@ Variable | Default | Required | Accepted Values | Description
 `DEBUG` | false | | `true`, `false` | Enable verbose logs
 `DOCKER_MAUTIC_ROLE` | mautic_web | | `mautic_cron`, `mautic_web`, `mautic_worker (string) | Container role
 `DOCKER_MAUTIC_LOAD_TEST_DATA` | false | | `true`, `false` | Load demo instance
-`DOCKER_MAUTIC_RUN_MIGRATIONS` | false | | `true`, `false` | Update directory and database structure (please run on major updates)
 `DOCKER_MAUTIC_WORKERS_CONSUME_EMAIL` | 2 | | integer | Number of workers to start consuming e-mails
 `DOCKER_MAUTIC_WORKERS_CONSUME_HIT` | 2 | | integer | Number of workers to start consuming hits
 `DOCKER_MAUTIC_WORKERS_CONSUME_FAILED` | 2 | | integer | Number of workers to start consuming failed e-mails

apache/Dockerfile

@@ -65,6 +65,15 @@ RUN cd /opt && \
 
 FROM php:8.3-apache
 
+LABEL vendor="Mautic"
+LABEL maintainer="Mautic core team <>"
+
+# Define Mautic volumes to persist data
+VOLUME /var/www/html/config
+VOLUME /var/www/html/var/logs
+VOLUME /var/www/html/docroot/media/files
+VOLUME /var/www/html/docroot/media/images
+
 # Setting PHP properties
 ENV PHP_INI_VALUE_DATE_TIMEZONE='UTC' \
     PHP_INI_VALUE_MEMORY_LIMIT=512M \
@@ -151,16 +160,8 @@ RUN a2enmod rewrite
 # Set correct ownership for Mautic var folder
 RUN chown -R www-data:www-data /var/www/html/var/
 
-# Define Mautic volumes to persist data
-VOLUME /var/www/html/config
-VOLUME /var/www/html/var/logs
-VOLUME /var/www/html/docroot/media
-
 WORKDIR /var/www/html/docroot
 
-LABEL vendor="Mautic"
-LABEL maintainer="Mautic core team <>"
-
 ENTRYPOINT ["/entrypoint.sh"]
 
 CMD ["apache2-foreground"]

common/entrypoint_mautic_web.sh

@@ -9,9 +9,7 @@ if [ "$DOCKER_MAUTIC_LOAD_TEST_DATA" = "true" ]; then
 fi
 
 # run migrations
-if [ "$DOCKER_MAUTIC_RUN_MIGRATIONS" = "true" ]; then
-  su -s /bin/bash $MAUTIC_WWW_USER -c "php $MAUTIC_CONSOLE doctrine:migration:migrate -n"
-fi
+su -s /bin/bash $MAUTIC_WWW_USER -c "php $MAUTIC_CONSOLE doctrine:migration:migrate -n"
 
 # execute the provided entrypoint
 "$@"

examples/basic/.env

@@ -6,5 +6,4 @@ MYSQL_DATABASE=mautic_db
 MYSQL_USER=mautic_db_user
 MYSQL_PASSWORD=mautic_db_pwd
 MYSQL_ROOT_PASSWORD=changeme
-DOCKER_MAUTIC_RUN_MIGRATIONS=false
 DOCKER_MAUTIC_LOAD_TEST_DATA=false

examples/basic/docker-compose.yml

@@ -35,7 +35,6 @@ services:
 
     environment:
       - DOCKER_MAUTIC_LOAD_TEST_DATA=${DOCKER_MAUTIC_LOAD_TEST_DATA}
-      - DOCKER_MAUTIC_RUN_MIGRATIONS=${DOCKER_MAUTIC_RUN_MIGRATIONS}
     env_file:
       - .mautic_env
     healthcheck:

examples/custom-plugins/.env

@@ -8,5 +8,4 @@ MYSQL_USER=mautic_db_user
 MYSQL_PASSWORD=
 # MYSQL_ROOT_PASSWORD should be set to a long secure alphanumeric sequence
 MYSQL_ROOT_PASSWORD=
-DOCKER_MAUTIC_RUN_MIGRATIONS=false
 DOCKER_MAUTIC_LOAD_TEST_DATA=false

examples/custom-plugins/docker-compose.yml

@@ -36,7 +36,6 @@ services:
 
     environment:
       - DOCKER_MAUTIC_LOAD_TEST_DATA=${DOCKER_MAUTIC_LOAD_TEST_DATA}
-      - DOCKER_MAUTIC_RUN_MIGRATIONS=${DOCKER_MAUTIC_RUN_MIGRATIONS}
     env_file:
       - .mautic_env
     healthcheck:

examples/fpm-nginx/.env

@@ -6,5 +6,4 @@ MYSQL_DATABASE=mautic_db
 MYSQL_USER=mautic_db_user
 MYSQL_PASSWORD=mautic_db_pwd
 MYSQL_ROOT_PASSWORD=changeme
-DOCKER_MAUTIC_RUN_MIGRATIONS=false
 DOCKER_MAUTIC_LOAD_TEST_DATA=false

examples/fpm-nginx/docker-compose.yml

@@ -48,7 +48,6 @@ services:
 
     environment:
       - DOCKER_MAUTIC_LOAD_TEST_DATA=${DOCKER_MAUTIC_LOAD_TEST_DATA}
-      - DOCKER_MAUTIC_RUN_MIGRATIONS=${DOCKER_MAUTIC_RUN_MIGRATIONS}
     env_file:
       - .mautic_env
     healthcheck:

examples/rabbitmq-worker/.env

@@ -7,5 +7,4 @@ MYSQL_USER=mautic_db_user
 MYSQL_PASSWORD=mautic_db_pwd
 MYSQL_ROOT_PASSWORD=changeme
 RABBITMQ_DEFAULT_VHOST=mautic
-DOCKER_MAUTIC_RUN_MIGRATIONS=false
 DOCKER_MAUTIC_LOAD_TEST_DATA=false