Merge branch 'master' into feature/php.ini

Author: madmath03

README.md

@@ -131,17 +131,21 @@ Example `docker-compose.yml` for `mautic`:
         - mautic_data:/var/www/html
       environment:
         - MAUTIC_DB_HOST=127.0.0.1
+        - MYSQL_PORT_3306_TCP=3306
         - MAUTIC_DB_USER=root
         - MAUTIC_DB_PASSWORD=mysecret
         - MAUTIC_DB_NAME=mautic
 
     mauticdb:
       image: mysql:5.6
       environment:
-        MYSQL_ROOT_PASSWORD=mysecret
+        - MYSQL_ROOT_PASSWORD=mysecret
 
 Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
 
+Run `docker inspect mautic_mauticdb_1 | grep IPAddress` to find out correct IP address of database container and setup the reference to mautic container in MAUTIC_DB_HOST environment variable.
+
+
 # Supported Docker versions
 
 This image is officially supported on Docker version 1.7.1.

apache/Dockerfile

@@ -33,8 +33,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
-ENV MAUTIC_VERSION 2.15.1
-ENV MAUTIC_SHA1 1fbf6f99a64d6da71a8c09a43576093b077913e2
+ENV MAUTIC_VERSION 2.15.2
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

apache/docker-entrypoint.sh

@@ -86,7 +86,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
         echo "10,40 * * * *     www-data   php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php -a -e app/AppKernel.php ]; then
+if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
         echo >&2 "Mautic not found in $(pwd) - copying now..."
 
         if [ "$(ls -A)" ]; then

apache/mautic.crontab

@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1

beta-apache/Dockerfile

@@ -33,7 +33,7 @@ VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
 ENV MAUTIC_VERSION 2.15.2
-ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

beta-apache/docker-entrypoint.sh

@@ -85,7 +85,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
         echo "10,40 * * * *     www-data   php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php -a -e app/AppKernel.php ]; then
+if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
         echo >&2 "Mautic not found in $(pwd) - copying now..."
 
         if [ "$(ls -A)" ]; then

beta-apache/mautic.crontab

@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1

beta-fpm/Dockerfile

@@ -33,7 +33,7 @@ VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
 ENV MAUTIC_VERSION 2.15.2
-ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

beta-fpm/docker-entrypoint.sh

@@ -85,7 +85,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
         echo "10,40 * * * *     www-data   php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php -a -e app/AppKernel.php ]; then
+if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
         echo >&2 "Mautic not found in $(pwd) - copying now..."
 
         if [ "$(ls -A)" ]; then

beta-fpm/mautic.crontab

@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1