From d71fffa06720a17fb6c644f19a22506b3808a70b Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Tue, 18 Oct 2016 11:20:51 -0500
Subject: [PATCH] Add Joomla 3.6.3 release

---
 apache-php7/Dockerfile           | 4 ++--
 apache-php7/docker-entrypoint.sh | 3 +++
 apache/Dockerfile                | 4 ++--
 apache/docker-entrypoint.sh      | 3 +++
 fpm-php7/Dockerfile              | 4 ++--
 fpm-php7/docker-entrypoint.sh    | 3 +++
 fpm/Dockerfile                   | 4 ++--
 fpm/docker-entrypoint.sh         | 3 +++
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apache-php7/Dockerfile b/apache-php7/Dockerfile
index 4aa2691..1e0552d 100755
--- a/apache-php7/Dockerfile
+++ b/apache-php7/Dockerfile
@@ -14,8 +14,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.2
-ENV JOOMLA_SHA1 fdaa25337aaabd0d673aafc0ff90e7375de2d6e3
+ENV JOOMLA_VERSION 3.6.3
+ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/apache-php7/docker-entrypoint.sh b/apache-php7/docker-entrypoint.sh
index 0f1acae..5d858b4 100755
--- a/apache-php7/docker-entrypoint.sh
+++ b/apache-php7/docker-entrypoint.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+#wait for dockercompose to start the mysql
+sleep 3
+
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/apache/Dockerfile b/apache/Dockerfile
index 62f9381..17f0f5f 100755
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -14,8 +14,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.2
-ENV JOOMLA_SHA1 fdaa25337aaabd0d673aafc0ff90e7375de2d6e3
+ENV JOOMLA_VERSION 3.6.3
+ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 0f1acae..5d858b4 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+#wait for dockercompose to start the mysql
+sleep 3
+
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/fpm-php7/Dockerfile b/fpm-php7/Dockerfile
index 887ea3f..e56ecdc 100755
--- a/fpm-php7/Dockerfile
+++ b/fpm-php7/Dockerfile
@@ -11,8 +11,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.2
-ENV JOOMLA_SHA1 fdaa25337aaabd0d673aafc0ff90e7375de2d6e3
+ENV JOOMLA_VERSION 3.6.3
+ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/fpm-php7/docker-entrypoint.sh b/fpm-php7/docker-entrypoint.sh
index 0f1acae..5d858b4 100755
--- a/fpm-php7/docker-entrypoint.sh
+++ b/fpm-php7/docker-entrypoint.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+#wait for dockercompose to start the mysql
+sleep 3
+
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 84553ff..d349ed6 100755
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -11,8 +11,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.2
-ENV JOOMLA_SHA1 fdaa25337aaabd0d673aafc0ff90e7375de2d6e3
+ENV JOOMLA_VERSION 3.6.3
+ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 0f1acae..5d858b4 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+#wait for dockercompose to start the mysql
+sleep 3
+
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then