fix Dockerfil on Docker hub is outdated mautic#114

forestvpn · Jul 11, 2019 · d00c733 · d00c733
1 parent 8ff6cfa
commit d00c733
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -20,11 +20,11 @@ There are also another images that fit your needs:
 
 | Tag | PHP | Web Server | Compatibility |
 |-----|:-----:|:------------:|:---------------:|
-| latest | 7.1.23 | Apache | <= 2.15.0 |
-| apache | 7.1.23 | Apache | <= 2.15.0 |
-| fpm | 7.1.23 | Nginx | <= 2.15.0 |
-| beta-apache | 7.2.12 | Apache | >= 2.15.0 |
-| beta-fpm | 7.2.12 | Nginx | >= 2.15.0 |
+| latest | 7.1.23 | Apache | <= 2.15.1 |
+| apache | 7.1.23 | Apache | <= 2.15.1 |
+| fpm | 7.1.23 | Nginx | <= 2.15.1 |
+| beta-apache | 7.2.12 | Apache | >= 2.15.1 |
+| beta-fpm | 7.2.12 | Nginx | >= 2.15.1 |
 
 **You can use the beta images to test latest beta releases of Mautic with current PHP version.**
 

diff --git a/apache/Dockerfile b/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.0
-ENV MAUTIC_SHA1 b07bd42bb092cc96785d2541b33700b55f74ece7
+ENV MAUTIC_VERSION 2.15.1
+ENV MAUTIC_SHA1 1fbf6f99a64d6da71a8c09a43576093b077913e2
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
@@ -15,6 +15,7 @@ if [ -n "$MYSQL_PORT_3306_TCP" ]; then
 fi
 
 
+
 if [ -z "$MAUTIC_DB_HOST" ]; then
         echo >&2 "error: missing MAUTIC_DB_HOST and MYSQL_PORT_3306_TCP environment variables"
         echo >&2 "  Did you forget to --link some_mysql_container:mysql or set an external db"
@@ -124,7 +125,6 @@ echo >&2
 echo >&2 "========================================================================"
 
 
-
 # Github Pull Tester
 if [ -n "$MAUTIC_TESTER" ]; then
   echo >&2 "Copying Mautic Github Pull Tester"

diff --git a/apache/makeconfig.php b/apache/makeconfig.php
@@ -22,6 +22,9 @@
 if(array_key_exists('MAUTIC_DB_NAME', $_ENV)) {
     $parameters['db_name'] = $_ENV['MAUTIC_DB_NAME'];
 }
+if(array_key_exists('MAUTIC_DB_TABLE_PREFIX', $_ENV)) {
+    $parameters['db_table_prefix'] = $_ENV['MAUTIC_DB_TABLE_PREFIX'];
+}
 if(array_key_exists('MAUTIC_DB_USER', $_ENV)) {
     $parameters['db_user'] = $_ENV['MAUTIC_DB_USER'];
 }

diff --git a/beta-apache/Dockerfile b/beta-apache/Dockerfile
@@ -32,8 +32,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.0
-ENV MAUTIC_SHA1 b07bd42bb092cc96785d2541b33700b55f74ece7
+ENV MAUTIC_VERSION 2.15.2
+ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/beta-fpm/Dockerfile b/beta-fpm/Dockerfile
@@ -32,8 +32,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.0
-ENV MAUTIC_SHA1 b07bd42bb092cc96785d2541b33700b55f74ece7
+ENV MAUTIC_VERSION 2.15.2
+ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/fpm/Dockerfile b/fpm/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.0
-ENV MAUTIC_SHA1 b07bd42bb092cc96785d2541b33700b55f74ece7
+ENV MAUTIC_VERSION 2.15.1
+ENV MAUTIC_SHA1 1fbf6f99a64d6da71a8c09a43576093b077913e2
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
@@ -15,6 +15,7 @@ if [ -n "$MYSQL_PORT_3306_TCP" ]; then
 fi
 
 
+
 if [ -z "$MAUTIC_DB_HOST" ]; then
         echo >&2 "error: missing MAUTIC_DB_HOST and MYSQL_PORT_3306_TCP environment variables"
         echo >&2 "  Did you forget to --link some_mysql_container:mysql or set an external db"
@@ -124,13 +125,13 @@ echo >&2
 echo >&2 "========================================================================"
 
 
-
 # Github Pull Tester
 if [ -n "$MAUTIC_TESTER" ]; then
   echo >&2 "Copying Mautic Github Pull Tester"
   wget https://raw.githubusercontent.com/mautic/mautic-tester/master/tester.php
 fi
 
+
 "$@" &
 MAINPID=$!
 

diff --git a/fpm/makeconfig.php b/fpm/makeconfig.php
@@ -22,6 +22,9 @@
 if(array_key_exists('MAUTIC_DB_NAME', $_ENV)) {
     $parameters['db_name'] = $_ENV['MAUTIC_DB_NAME'];
 }
+if(array_key_exists('MAUTIC_DB_TABLE_PREFIX', $_ENV)) {
+    $parameters['db_table_prefix'] = $_ENV['MAUTIC_DB_TABLE_PREFIX'];
+}
 if(array_key_exists('MAUTIC_DB_USER', $_ENV)) {
     $parameters['db_user'] = $_ENV['MAUTIC_DB_USER'];
 }

diff --git a/update.sh b/update.sh
@@ -4,7 +4,7 @@ set -e
 current="$(curl https://api.github.com/repos/mautic/mautic/releases/latest -s | jq -r .name)"
 
 # TODO - Expose SHA signatures for the packages somewhere
-wget -O mautic.zip https://s3.amazonaws.com/mautic/releases/$current.zip
+wget -O mautic.zip https://github.com/mautic/mautic/releases/download/$current/$current.zip
 sha1="$(sha1sum mautic.zip | sed -r 's/ .*//')"
 
 for variant in apache fpm; do