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.6.0 #1970

Merged
merged 1 commit into from
Jul 21, 2016
Merged

Update to Joomla! 3.6.0 #1970

merged 1 commit into from
Jul 21, 2016

Conversation

mbabker
Copy link
Contributor

@mbabker mbabker commented Jul 21, 2016

No description provided.

@tianon
Copy link
Member

tianon commented Jul 21, 2016

Relevant diff: (for easier review)

diff --git a/joomla_apache-php7/Dockerfile b/joomla_apache-php7/Dockerfile
index 1408e55..05152dd 100755
--- a/joomla_apache-php7/Dockerfile
+++ b/joomla_apache-php7/Dockerfile
@@ -13,8 +13,8 @@ RUN docker-php-ext-install mysqli
 VOLUME /var/www/html

 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.5.1
-ENV JOOMLA_SHA1 e24649f806d12c608004b9049b8bb90a9a701b63
+ENV JOOMLA_VERSION 3.6.0
+ENV JOOMLA_SHA1 9e71357f689218705b15e653b7cdd57b498d4fa4

 # 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 5ea424d..cf054e1 100755
--- a/joomla_fpm-php7/Dockerfile
+++ b/joomla_fpm-php7/Dockerfile
@@ -10,8 +10,8 @@ RUN docker-php-ext-install mysqli
 VOLUME /var/www/html

 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.5.1
-ENV JOOMLA_SHA1 e24649f806d12c608004b9049b8bb90a9a701b63
+ENV JOOMLA_VERSION 3.6.0
+ENV JOOMLA_SHA1 9e71357f689218705b15e653b7cdd57b498d4fa4

 # 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 85b4816..f247fe9 100755
--- a/joomla_fpm/Dockerfile
+++ b/joomla_fpm/Dockerfile
@@ -10,8 +10,8 @@ RUN docker-php-ext-install mysqli
 VOLUME /var/www/html

 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.5.1
-ENV JOOMLA_SHA1 e24649f806d12c608004b9049b8bb90a9a701b63
+ENV JOOMLA_VERSION 3.6.0
+ENV JOOMLA_SHA1 9e71357f689218705b15e653b7cdd57b498d4fa4

 # 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 4e716c2..527d11a 100755
--- a/joomla_latest/Dockerfile
+++ b/joomla_latest/Dockerfile
@@ -13,8 +13,8 @@ RUN docker-php-ext-install mysqli
 VOLUME /var/www/html

 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.5.1
-ENV JOOMLA_SHA1 e24649f806d12c608004b9049b8bb90a9a701b63
+ENV JOOMLA_VERSION 3.6.0
+ENV JOOMLA_SHA1 9e71357f689218705b15e653b7cdd57b498d4fa4

 # 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 \

@tianon
Copy link
Member

tianon commented Jul 21, 2016

LGTM

Build test of #1970; 62a9772 (joomla):

$ bashbrew build joomla:3.6.0-apache
Building bashbrew/cache:b7c0b3049be96d8394fc3f556d525a3def7059e9f8eb61a70a51cb433dc17741 (joomla:3.6.0-apache)
Tagging joomla:3.6.0-apache
Tagging joomla:3.6.0
Tagging joomla:3.6-apache
Tagging joomla:3.6
Tagging joomla:3-apache
Tagging joomla:apache
Tagging joomla:3
Tagging joomla:latest

$ test/run.sh joomla:3.6.0-apache
testing joomla:3.6.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.6.0-apache-php7
Building bashbrew/cache:f98a424e8eadfbc1914d07ea9773a6311265482bd4b90fefa81e6081d348b2db (joomla:3.6.0-apache-php7)
Tagging joomla:3.6.0-apache-php7
Tagging joomla:3.6-apache-php7
Tagging joomla:3-apache-php7
Tagging joomla:apache-php7

$ test/run.sh joomla:3.6.0-apache-php7
testing joomla:3.6.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.6.0-fpm
Building bashbrew/cache:31909cf3bb8882fce3562872acf83651ef86ba5246cc3980423b0ae2f4ef2f55 (joomla:3.6.0-fpm)
Tagging joomla:3.6.0-fpm
Tagging joomla:3.6-fpm
Tagging joomla:3-fpm
Tagging joomla:fpm

$ test/run.sh joomla:3.6.0-fpm
testing joomla:3.6.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.6.0-fpm-php7
Building bashbrew/cache:f803bd2b088bd2b59646c7e1d5c5ee5f2403bec359f6d699d16bdcbf91f47528 (joomla:3.6.0-fpm-php7)
Tagging joomla:3.6.0-fpm-php7
Tagging joomla:3.6-fpm-php7
Tagging joomla:3-fpm-php7
Tagging joomla:fpm-php7

$ test/run.sh joomla:3.6.0-fpm-php7
testing joomla:3.6.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

@tianon tianon merged commit f47929a into docker-library:master Jul 21, 2016
@mbabker mbabker deleted the patch-1 branch July 21, 2016 17:11
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