Update Drupal 8.2.6 and 7.54 #2612

Merged
merged 1 commit into from Feb 6, 2017

Conversation

Projects
None yet
3 participants
@aschonbe
Contributor

aschonbe commented Feb 2, 2017

Update official Drupal docker-library image to use versions 8.2.6 and 7.54 of Drupal.

aschonbe referenced this pull request in docker-library/drupal Feb 2, 2017

@aschonbe

This comment has been minimized.

Show comment
Hide comment
@aschonbe

aschonbe Feb 6, 2017

Contributor

@yosifkit is there anything missing from this pull request that would prevent it from being merged?

Contributor

aschonbe commented Feb 6, 2017

@yosifkit is there anything missing from this pull request that would prevent it from being merged?

@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Feb 6, 2017

Member

@aschonbe build test and official images review 👍

$ diff -u <(./generate-stackbrew-library.sh) <(curl -fsSL 'https://raw.githubusercontent.com/aschonbe/official-images/44b06728f6d9513a9f438dea553a18d4cd9b50c8/library/drupal')
$ 
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
index 8fbe5f1..78422e6 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 7.53
-ENV DRUPAL_MD5 4230279ecca4f0cde652a219e10327e7
+ENV DRUPAL_VERSION 7.54
+ENV DRUPAL_MD5 3068cbe488075ae166e23ea6cd29cf0f
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile
index 82fd305..604f2be 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7/Dockerfile
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 7.53
-ENV DRUPAL_MD5 4230279ecca4f0cde652a219e10327e7
+ENV DRUPAL_VERSION 7.54
+ENV DRUPAL_MD5 3068cbe488075ae166e23ea6cd29cf0f
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index 08a5ea2..b366eda 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -21,8 +21,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.2.5
-ENV DRUPAL_MD5 4bfd35c34ce1b4ba5bac2d18e0d6b5c9
+ENV DRUPAL_VERSION 8.2.6
+ENV DRUPAL_MD5 57526a827771ea8a06db1792f1602a85
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 4a30a59..ab3efb8 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -23,8 +23,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.2.5
-ENV DRUPAL_MD5 4bfd35c34ce1b4ba5bac2d18e0d6b5c9
+ENV DRUPAL_VERSION 8.2.6
+ENV DRUPAL_MD5 57526a827771ea8a06db1792f1602a85
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
Member

tianon commented Feb 6, 2017

@aschonbe build test and official images review 👍

$ diff -u <(./generate-stackbrew-library.sh) <(curl -fsSL 'https://raw.githubusercontent.com/aschonbe/official-images/44b06728f6d9513a9f438dea553a18d4cd9b50c8/library/drupal')
$ 
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
index 8fbe5f1..78422e6 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 7.53
-ENV DRUPAL_MD5 4230279ecca4f0cde652a219e10327e7
+ENV DRUPAL_VERSION 7.54
+ENV DRUPAL_MD5 3068cbe488075ae166e23ea6cd29cf0f
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile
index 82fd305..604f2be 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7/Dockerfile
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 7.53
-ENV DRUPAL_MD5 4230279ecca4f0cde652a219e10327e7
+ENV DRUPAL_VERSION 7.54
+ENV DRUPAL_MD5 3068cbe488075ae166e23ea6cd29cf0f
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index 08a5ea2..b366eda 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -21,8 +21,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.2.5
-ENV DRUPAL_MD5 4bfd35c34ce1b4ba5bac2d18e0d6b5c9
+ENV DRUPAL_VERSION 8.2.6
+ENV DRUPAL_MD5 57526a827771ea8a06db1792f1602a85
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 4a30a59..ab3efb8 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -23,8 +23,8 @@ RUN { \
 WORKDIR /var/www/html
 
 # https://www.drupal.org/node/3060/release
-ENV DRUPAL_VERSION 8.2.5
-ENV DRUPAL_MD5 4bfd35c34ce1b4ba5bac2d18e0d6b5c9
+ENV DRUPAL_VERSION 8.2.6
+ENV DRUPAL_MD5 57526a827771ea8a06db1792f1602a85
 
 RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
 	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Feb 6, 2017

Member

LGTM

Build test of #2612; 44b0672 (drupal):

$ bashbrew build drupal:8.2.6-apache
Building bashbrew/cache:1b7d379b382106c8c71d9c1dfcd9245369c7e20123282e1abfe0d61f3d120b28 (drupal:8.2.6-apache)
Tagging drupal:8.2.6-apache
Tagging drupal:8.2-apache
Tagging drupal:8-apache
Tagging drupal:apache
Tagging drupal:8.2.6
Tagging drupal:8.2
Tagging drupal:8
Tagging drupal:latest

$ test/run.sh drupal:8.2.6-apache
testing drupal:8.2.6-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 drupal:8.2.6-fpm
Building bashbrew/cache:763446721ec2c751ada231f8f5961789786e9e190b8f8645569bdbb5de992ba2 (drupal:8.2.6-fpm)
Tagging drupal:8.2.6-fpm
Tagging drupal:8.2-fpm
Tagging drupal:8-fpm
Tagging drupal:fpm

$ test/run.sh drupal:8.2.6-fpm
testing drupal:8.2.6-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 drupal:7.54-apache
Building bashbrew/cache:022527e9037aaff675fc05e7bdf1e55606502fed5242b3ee2f96aff8a84adc7f (drupal:7.54-apache)
Tagging drupal:7.54-apache
Tagging drupal:7-apache
Tagging drupal:7.54
Tagging drupal:7

$ test/run.sh drupal:7.54-apache
testing drupal:7.54-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 drupal:7.54-fpm
Building bashbrew/cache:4f8634122c97482f205be4f3fc942fa2761184107e6cf4d734c0d0d80caa3dfa (drupal:7.54-fpm)
Tagging drupal:7.54-fpm
Tagging drupal:7-fpm

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

tianon commented Feb 6, 2017

LGTM

Build test of #2612; 44b0672 (drupal):

$ bashbrew build drupal:8.2.6-apache
Building bashbrew/cache:1b7d379b382106c8c71d9c1dfcd9245369c7e20123282e1abfe0d61f3d120b28 (drupal:8.2.6-apache)
Tagging drupal:8.2.6-apache
Tagging drupal:8.2-apache
Tagging drupal:8-apache
Tagging drupal:apache
Tagging drupal:8.2.6
Tagging drupal:8.2
Tagging drupal:8
Tagging drupal:latest

$ test/run.sh drupal:8.2.6-apache
testing drupal:8.2.6-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 drupal:8.2.6-fpm
Building bashbrew/cache:763446721ec2c751ada231f8f5961789786e9e190b8f8645569bdbb5de992ba2 (drupal:8.2.6-fpm)
Tagging drupal:8.2.6-fpm
Tagging drupal:8.2-fpm
Tagging drupal:8-fpm
Tagging drupal:fpm

$ test/run.sh drupal:8.2.6-fpm
testing drupal:8.2.6-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 drupal:7.54-apache
Building bashbrew/cache:022527e9037aaff675fc05e7bdf1e55606502fed5242b3ee2f96aff8a84adc7f (drupal:7.54-apache)
Tagging drupal:7.54-apache
Tagging drupal:7-apache
Tagging drupal:7.54
Tagging drupal:7

$ test/run.sh drupal:7.54-apache
testing drupal:7.54-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 drupal:7.54-fpm
Building bashbrew/cache:4f8634122c97482f205be4f3fc942fa2761184107e6cf4d734c0d0d80caa3dfa (drupal:7.54-fpm)
Tagging drupal:7.54-fpm
Tagging drupal:7-fpm

$ test/run.sh drupal:7.54-fpm
testing drupal:7.54-fpm
	'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 dd96530 into docker-library:master Feb 6, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@aschonbe

This comment has been minimized.

Show comment
Hide comment
@aschonbe

aschonbe Feb 6, 2017

Contributor

@tianon: Thank you!

For the future, would it help if I (or other "contributors") posted the diff and build test results or does a project owner ("member") have to do it (for the sake of authenticity, etc.)?

Contributor

aschonbe commented Feb 6, 2017

@tianon: Thank you!

For the future, would it help if I (or other "contributors") posted the diff and build test results or does a project owner ("member") have to do it (for the sake of authenticity, etc.)?

@tianon

This comment has been minimized.

Show comment
Hide comment
@tianon

tianon Feb 6, 2017

Member

@aschonbe yeah, probably better to just leave that to us -- we'd be running it separately anyhow to verify the result just to be sure 👍

Member

tianon commented Feb 6, 2017

@aschonbe yeah, probably better to just leave that to us -- we'd be running it separately anyhow to verify the result just to be sure 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment