Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Joomla! 3.8.4 #3953

Merged
merged 1 commit into from
Jan 30, 2018
Merged

Update to Joomla! 3.8.4 #3953

merged 1 commit into from
Jan 30, 2018

Conversation

mbabker
Copy link
Contributor

@mbabker mbabker commented Jan 30, 2018

No description provided.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index f82133b..165da99 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,11 +8,11 @@ joomla:3.8-apache
 joomla:3.8-apache-php7
 joomla:3.8-fpm
 joomla:3.8-fpm-php7
-joomla:3.8.2
-joomla:3.8.2-apache
-joomla:3.8.2-apache-php7
-joomla:3.8.2-fpm
-joomla:3.8.2-fpm-php7
+joomla:3.8.4
+joomla:3.8.4-apache
+joomla:3.8.4-apache-php7
+joomla:3.8.4-fpm
+joomla:3.8.4-fpm-php7
 joomla:apache
 joomla:apache-php7
 joomla:fpm
diff --git a/joomla_apache-php7/Dockerfile b/joomla_apache-php7/Dockerfile
index f44c844..8690bee 100755
--- a/joomla_apache-php7/Dockerfile
+++ b/joomla_apache-php7/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.0-apache
-MAINTAINER Michael Babker <michael.babker@joomla.org> (@mbabker)
+LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
 ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
@@ -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.8.2
-ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543
+ENV JOOMLA_VERSION 3.8.4
+ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec
 
 # 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/Dockerfile b/joomla_fpm-php7/Dockerfile
index bdea763..bc6b207 100755
--- a/joomla_fpm-php7/Dockerfile
+++ b/joomla_fpm-php7/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.0-fpm
-MAINTAINER Michael Babker <michael.babker@joomla.org> (@mbabker)
+LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
 ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
@@ -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.8.2
-ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543
+ENV JOOMLA_VERSION 3.8.4
+ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec
 
 # 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/Dockerfile b/joomla_fpm/Dockerfile
index 48ff4eb..8babde1 100755
--- a/joomla_fpm/Dockerfile
+++ b/joomla_fpm/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:5.6-fpm
-MAINTAINER Michael Babker <michael.babker@joomla.org> (@mbabker)
+LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
 ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
@@ -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.8.2
-ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543
+ENV JOOMLA_VERSION 3.8.4
+ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec
 
 # 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/Dockerfile b/joomla_latest/Dockerfile
index 2f22d6f..17290ec 100755
--- a/joomla_latest/Dockerfile
+++ b/joomla_latest/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:5.6-apache
-MAINTAINER Michael Babker <michael.babker@joomla.org> (@mbabker)
+LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
 
 # Disable remote database security requirements.
 ENV JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK=1
@@ -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.8.2
-ENV JOOMLA_SHA1 e68745d55cc5b1a7bb46f72f4296c6550e088543
+ENV JOOMLA_VERSION 3.8.4
+ENV JOOMLA_SHA1 3d8a321e626cdf3823fc6bd62aee222fd12c19ec
 
 # 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 \

@yosifkit
Copy link
Member

Build test of #3953; 03455b9; amd64 (joomla):

$ bashbrew build joomla:3.8.4-apache
Building bashbrew/cache:92bb2bdc5afa8c641cfa3cd146b24c6194bd8a4ded839c85a69fbc1855b00929 (joomla:3.8.4-apache)
Tagging joomla:3.8.4-apache
Tagging joomla:3.8-apache
Tagging joomla:3-apache
Tagging joomla:apache
Tagging joomla:3.8.4
Tagging joomla:3.8
Tagging joomla:3
Tagging joomla:latest

$ test/run.sh joomla:3.8.4-apache
testing joomla:3.8.4-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.4-apache-php7
Building bashbrew/cache:003600c56130a4ee8e9d534fb1b632f51d22358830dbaf422602134f4cb82b74 (joomla:3.8.4-apache-php7)
Tagging joomla:3.8.4-apache-php7
Tagging joomla:3.8-apache-php7
Tagging joomla:3-apache-php7
Tagging joomla:apache-php7

$ test/run.sh joomla:3.8.4-apache-php7
testing joomla:3.8.4-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.4-fpm
Building bashbrew/cache:8d44324759e80ccb1d30afd801559419a64ccf4c6d6a9f32686f83da4d644a9f (joomla:3.8.4-fpm)
Tagging joomla:3.8.4-fpm
Tagging joomla:3.8-fpm
Tagging joomla:3-fpm
Tagging joomla:fpm

$ test/run.sh joomla:3.8.4-fpm
testing joomla:3.8.4-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.4-fpm-php7
Building bashbrew/cache:9707a01faf6274e232ec84fc984a0de86005315f07cf315cf6f2d1ba3262fe62 (joomla:3.8.4-fpm-php7)
Tagging joomla:3.8.4-fpm-php7
Tagging joomla:3.8-fpm-php7
Tagging joomla:3-fpm-php7
Tagging joomla:fpm-php7

$ test/run.sh joomla:3.8.4-fpm-php7
testing joomla:3.8.4-fpm-php7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 1ca07bd into docker-library:master Jan 30, 2018
@mbabker mbabker deleted the patch-1 branch January 30, 2018 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants