Update to Joomla! 3.8.0 #3504
Merged
Update to Joomla! 3.8.0 #3504
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 7b3bc53..e9e7326 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,16 +3,16 @@ joomla:3-apache
joomla:3-apache-php7
joomla:3-fpm
joomla:3-fpm-php7
-joomla:3.7
-joomla:3.7-apache
-joomla:3.7-apache-php7
-joomla:3.7-fpm
-joomla:3.7-fpm-php7
-joomla:3.7.5
-joomla:3.7.5-apache
-joomla:3.7.5-apache-php7
-joomla:3.7.5-fpm
-joomla:3.7.5-fpm-php7
+joomla:3.8
+joomla:3.8-apache
+joomla:3.8-apache-php7
+joomla:3.8-fpm
+joomla:3.8-fpm-php7
+joomla:3.8.0
+joomla:3.8.0-apache
+joomla:3.8.0-apache-php7
+joomla:3.8.0-fpm
+joomla:3.8.0-fpm-php7
joomla:apache
joomla:apache-php7
joomla:fpm
diff --git a/joomla_apache-php7/Dockerfile b/joomla_apache-php7/Dockerfile
index 64a2632..8fc0c86 100755
--- a/joomla_apache-php7/Dockerfile
+++ b/joomla_apache-php7/Dockerfile
@@ -18,8 +18,8 @@ RUN docker-php-ext-install zip
VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.7.5
-ENV JOOMLA_SHA1 4a8ba6c70265879cf5c77bcc1b3a0fe9620ba02a
+ENV JOOMLA_VERSION 3.8.0
+ENV JOOMLA_SHA1 e15cfee1b31fe65b1c5038d605478404be9f64e2
# 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/joomla_apache-php7/docker-entrypoint.sh b/joomla_apache-php7/docker-entrypoint.sh
index 0f1acae..b0c1f74 100755
--- a/joomla_apache-php7/docker-entrypoint.sh
+++ b/joomla_apache-php7/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
- if [ -z "$JOOMLA_DB_PASSWORD" ]; then
+ if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2
diff --git a/joomla_fpm-php7/Dockerfile b/joomla_fpm-php7/Dockerfile
index 0907380..ebd27c2 100755
--- a/joomla_fpm-php7/Dockerfile
+++ b/joomla_fpm-php7/Dockerfile
@@ -15,8 +15,8 @@ RUN docker-php-ext-install zip
VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.7.5
-ENV JOOMLA_SHA1 4a8ba6c70265879cf5c77bcc1b3a0fe9620ba02a
+ENV JOOMLA_VERSION 3.8.0
+ENV JOOMLA_SHA1 e15cfee1b31fe65b1c5038d605478404be9f64e2
# 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/joomla_fpm-php7/docker-entrypoint.sh b/joomla_fpm-php7/docker-entrypoint.sh
index 0f1acae..b0c1f74 100755
--- a/joomla_fpm-php7/docker-entrypoint.sh
+++ b/joomla_fpm-php7/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
- if [ -z "$JOOMLA_DB_PASSWORD" ]; then
+ if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2
diff --git a/joomla_fpm/Dockerfile b/joomla_fpm/Dockerfile
index 019ff88..91b1120 100755
--- a/joomla_fpm/Dockerfile
+++ b/joomla_fpm/Dockerfile
@@ -15,8 +15,8 @@ RUN docker-php-ext-install zip
VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.7.5
-ENV JOOMLA_SHA1 4a8ba6c70265879cf5c77bcc1b3a0fe9620ba02a
+ENV JOOMLA_VERSION 3.8.0
+ENV JOOMLA_SHA1 e15cfee1b31fe65b1c5038d605478404be9f64e2
# 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/joomla_fpm/docker-entrypoint.sh b/joomla_fpm/docker-entrypoint.sh
index 0f1acae..b0c1f74 100755
--- a/joomla_fpm/docker-entrypoint.sh
+++ b/joomla_fpm/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
- if [ -z "$JOOMLA_DB_PASSWORD" ]; then
+ if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2
diff --git a/joomla_latest/Dockerfile b/joomla_latest/Dockerfile
index ac15da9..b377ae4 100755
--- a/joomla_latest/Dockerfile
+++ b/joomla_latest/Dockerfile
@@ -18,8 +18,8 @@ RUN docker-php-ext-install zip
VOLUME /var/www/html
# Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.7.5
-ENV JOOMLA_SHA1 4a8ba6c70265879cf5c77bcc1b3a0fe9620ba02a
+ENV JOOMLA_VERSION 3.8.0
+ENV JOOMLA_SHA1 e15cfee1b31fe65b1c5038d605478404be9f64e2
# 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/joomla_latest/docker-entrypoint.sh b/joomla_latest/docker-entrypoint.sh
index 0f1acae..b0c1f74 100755
--- a/joomla_latest/docker-entrypoint.sh
+++ b/joomla_latest/docker-entrypoint.sh
@@ -27,7 +27,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
fi
: ${JOOMLA_DB_NAME:=joomla}
- if [ -z "$JOOMLA_DB_PASSWORD" ]; then
+ if [ -z "$JOOMLA_DB_PASSWORD" ] && [ "$JOOMLA_DB_PASSWORD_ALLOW_EMPTY" != 'yes' ]; then
echo >&2 "error: missing required JOOMLA_DB_PASSWORD environment variable"
echo >&2 " Did you forget to -e JOOMLA_DB_PASSWORD=... ?"
echo >&2 |
|
Build test of #3504; ee9661a ( $ bashbrew build joomla:3.8.0-apache
Using bashbrew/cache:fce06398c7b7f909a08daf1b6aa1a213ca130c129f6dbb015a94c25e211a6d55 (joomla:3.8.0-apache)
Tagging joomla:3.8.0-apache
Tagging joomla:3.8-apache
Tagging joomla:3-apache
Tagging joomla:apache
Tagging joomla:3.8.0
Tagging joomla:3.8
Tagging joomla:3
Tagging joomla:latest
$ test/run.sh joomla:3.8.0-apache
testing joomla:3.8.0-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build joomla:3.8.0-apache-php7
Using bashbrew/cache:5a58d0a284d7ef85453991004e225be612c299d87565b77cff33b4a6cb0f8ed4 (joomla:3.8.0-apache-php7)
Tagging joomla:3.8.0-apache-php7
Tagging joomla:3.8-apache-php7
Tagging joomla:3-apache-php7
Tagging joomla:apache-php7
$ test/run.sh joomla:3.8.0-apache-php7
testing joomla:3.8.0-apache-php7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build joomla:3.8.0-fpm
Using bashbrew/cache:24db5d87d57639fe0305c61bcc01690ce22570a506204648fac1f33941530a58 (joomla:3.8.0-fpm)
Tagging joomla:3.8.0-fpm
Tagging joomla:3.8-fpm
Tagging joomla:3-fpm
Tagging joomla:fpm
$ test/run.sh joomla:3.8.0-fpm
testing joomla:3.8.0-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build joomla:3.8.0-fpm-php7
Building bashbrew/cache:0b6dd151c7bbd16ba551caa9f74c5518245821f9c871295519fa69351dcf897e (joomla:3.8.0-fpm-php7)
Tagging joomla:3.8.0-fpm-php7
Tagging joomla:3.8-fpm-php7
Tagging joomla:3-fpm-php7
Tagging joomla:fpm-php7
$ test/run.sh joomla:3.8.0-fpm-php7
testing joomla:3.8.0-fpm-php7
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.