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 wordpress #7726

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 1, 2020

Changes:

Changes:

- docker-library/wordpress@bf85cc7: Update to 5.4
- docker-library/wordpress@2e25a10: Merge pull request docker-library/wordpress#471 from infosiftr/skip-pre-release-cli
- docker-library/wordpress@25dcdc0: Skip wp-cli releases that don't have release artifacts
@yosifkit
Copy link
Member

yosifkit commented Apr 1, 2020

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 0aaeba0..f7209d0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,38 +14,38 @@ wordpress:5-php7.4
 wordpress:5-php7.4-apache
 wordpress:5-php7.4-fpm
 wordpress:5-php7.4-fpm-alpine
-wordpress:5.3
-wordpress:5.3-apache
-wordpress:5.3-fpm
-wordpress:5.3-fpm-alpine
-wordpress:5.3-php7.2
-wordpress:5.3-php7.2-apache
-wordpress:5.3-php7.2-fpm
-wordpress:5.3-php7.2-fpm-alpine
-wordpress:5.3-php7.3
-wordpress:5.3-php7.3-apache
-wordpress:5.3-php7.3-fpm
-wordpress:5.3-php7.3-fpm-alpine
-wordpress:5.3-php7.4
-wordpress:5.3-php7.4-apache
-wordpress:5.3-php7.4-fpm
-wordpress:5.3-php7.4-fpm-alpine
-wordpress:5.3.2
-wordpress:5.3.2-apache
-wordpress:5.3.2-fpm
-wordpress:5.3.2-fpm-alpine
-wordpress:5.3.2-php7.2
-wordpress:5.3.2-php7.2-apache
-wordpress:5.3.2-php7.2-fpm
-wordpress:5.3.2-php7.2-fpm-alpine
-wordpress:5.3.2-php7.3
-wordpress:5.3.2-php7.3-apache
-wordpress:5.3.2-php7.3-fpm
-wordpress:5.3.2-php7.3-fpm-alpine
-wordpress:5.3.2-php7.4
-wordpress:5.3.2-php7.4-apache
-wordpress:5.3.2-php7.4-fpm
-wordpress:5.3.2-php7.4-fpm-alpine
+wordpress:5.4
+wordpress:5.4-apache
+wordpress:5.4-fpm
+wordpress:5.4-fpm-alpine
+wordpress:5.4-php7.2
+wordpress:5.4-php7.2-apache
+wordpress:5.4-php7.2-fpm
+wordpress:5.4-php7.2-fpm-alpine
+wordpress:5.4-php7.3
+wordpress:5.4-php7.3-apache
+wordpress:5.4-php7.3-fpm
+wordpress:5.4-php7.3-fpm-alpine
+wordpress:5.4-php7.4
+wordpress:5.4-php7.4-apache
+wordpress:5.4-php7.4-fpm
+wordpress:5.4-php7.4-fpm-alpine
+wordpress:5.4.0
+wordpress:5.4.0-apache
+wordpress:5.4.0-fpm
+wordpress:5.4.0-fpm-alpine
+wordpress:5.4.0-php7.2
+wordpress:5.4.0-php7.2-apache
+wordpress:5.4.0-php7.2-fpm
+wordpress:5.4.0-php7.2-fpm-alpine
+wordpress:5.4.0-php7.3
+wordpress:5.4.0-php7.3-apache
+wordpress:5.4.0-php7.3-fpm
+wordpress:5.4.0-php7.3-fpm-alpine
+wordpress:5.4.0-php7.4
+wordpress:5.4.0-php7.4-apache
+wordpress:5.4.0-php7.4-fpm
+wordpress:5.4.0-php7.4-fpm-alpine
 wordpress:apache
 wordpress:cli
 wordpress:cli-2
diff --git a/wordpress_php7.2-fpm-alpine/Dockerfile b/wordpress_php7.2-fpm-alpine/Dockerfile
index 77149cf..96f816d 100644
--- a/wordpress_php7.2-fpm-alpine/Dockerfile
+++ b/wordpress_php7.2-fpm-alpine/Dockerfile
@@ -67,8 +67,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.2-fpm/Dockerfile b/wordpress_php7.2-fpm/Dockerfile
index 33cd70a..727066c 100644
--- a/wordpress_php7.2-fpm/Dockerfile
+++ b/wordpress_php7.2-fpm/Dockerfile
@@ -74,8 +74,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.2/Dockerfile b/wordpress_php7.2/Dockerfile
index 5ddd744..458a593 100644
--- a/wordpress_php7.2/Dockerfile
+++ b/wordpress_php7.2/Dockerfile
@@ -93,8 +93,8 @@ RUN set -eux; \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.3-fpm-alpine/Dockerfile b/wordpress_php7.3-fpm-alpine/Dockerfile
index a5094e3..41440ef 100644
--- a/wordpress_php7.3-fpm-alpine/Dockerfile
+++ b/wordpress_php7.3-fpm-alpine/Dockerfile
@@ -68,8 +68,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.3-fpm/Dockerfile b/wordpress_php7.3-fpm/Dockerfile
index 92fe978..a951fbd 100644
--- a/wordpress_php7.3-fpm/Dockerfile
+++ b/wordpress_php7.3-fpm/Dockerfile
@@ -75,8 +75,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.3/Dockerfile b/wordpress_php7.3/Dockerfile
index 87dbb6b..707b227 100644
--- a/wordpress_php7.3/Dockerfile
+++ b/wordpress_php7.3/Dockerfile
@@ -94,8 +94,8 @@ RUN set -eux; \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.4-fpm-alpine/Dockerfile b/wordpress_php7.4-fpm-alpine/Dockerfile
index a93124f..9f05e3f 100644
--- a/wordpress_php7.4-fpm-alpine/Dockerfile
+++ b/wordpress_php7.4-fpm-alpine/Dockerfile
@@ -68,8 +68,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.4-fpm/Dockerfile b/wordpress_php7.4-fpm/Dockerfile
index f27da27..7d3f50d 100644
--- a/wordpress_php7.4-fpm/Dockerfile
+++ b/wordpress_php7.4-fpm/Dockerfile
@@ -75,8 +75,8 @@ RUN { \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \
diff --git a/wordpress_php7.4/Dockerfile b/wordpress_php7.4/Dockerfile
index 381d616..4411e0b 100644
--- a/wordpress_php7.4/Dockerfile
+++ b/wordpress_php7.4/Dockerfile
@@ -94,8 +94,8 @@ RUN set -eux; \
 
 VOLUME /var/www/html
 
-ENV WORDPRESS_VERSION 5.3.2
-ENV WORDPRESS_SHA1 fded476f112dbab14e3b5acddd2bcfa550e7b01b
+ENV WORDPRESS_VERSION 5.4
+ENV WORDPRESS_SHA1 d5f1e6d7cadd72c11d086a2e1ede0a72f23d993e
 
 RUN set -ex; \
 	curl -o wordpress.tar.gz -fSL "https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz"; \

@yosifkit
Copy link
Member

yosifkit commented Apr 1, 2020

Build test of #7726; 8c5643d; amd64 (wordpress):

$ bashbrew build wordpress:5.4.0-php7.2-apache
Building bashbrew/cache:83970664be147aa18e553b8854412c987a01e29f5af64de902f919753e6735a9 (wordpress:5.4.0-php7.2-apache)
Tagging wordpress:5.4.0-php7.2-apache
Tagging wordpress:5.4-php7.2-apache
Tagging wordpress:5-php7.2-apache
Tagging wordpress:php7.2-apache
Tagging wordpress:5.4.0-php7.2
Tagging wordpress:5.4-php7.2
Tagging wordpress:5-php7.2
Tagging wordpress:php7.2

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


$ bashbrew build wordpress:5.4.0-php7.2-fpm
Building bashbrew/cache:81a8cea57a892b22398bac1edab5f54f2735cf5540f0142ae5beb04a916a6a87 (wordpress:5.4.0-php7.2-fpm)
Tagging wordpress:5.4.0-php7.2-fpm
Tagging wordpress:5.4-php7.2-fpm
Tagging wordpress:5-php7.2-fpm
Tagging wordpress:php7.2-fpm

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


$ bashbrew build wordpress:5.4.0-php7.2-fpm-alpine
Building bashbrew/cache:aa8adcd8aea389e8a3298ccecc5631a7529b92ee946c5fdd869e05af91ba9044 (wordpress:5.4.0-php7.2-fpm-alpine)
Tagging wordpress:5.4.0-php7.2-fpm-alpine
Tagging wordpress:5.4-php7.2-fpm-alpine
Tagging wordpress:5-php7.2-fpm-alpine
Tagging wordpress:php7.2-fpm-alpine

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


$ bashbrew build wordpress:5.4.0-apache
Building bashbrew/cache:7d0def20046e616d737b4d953d55a22a25379fffa8b709878c7437a75f50313a (wordpress:5.4.0-apache)
Tagging wordpress:5.4.0-apache
Tagging wordpress:5.4-apache
Tagging wordpress:5-apache
Tagging wordpress:apache
Tagging wordpress:5.4.0
Tagging wordpress:5.4
Tagging wordpress:5
Tagging wordpress:latest
Tagging wordpress:5.4.0-php7.3-apache
Tagging wordpress:5.4-php7.3-apache
Tagging wordpress:5-php7.3-apache
Tagging wordpress:php7.3-apache
Tagging wordpress:5.4.0-php7.3
Tagging wordpress:5.4-php7.3
Tagging wordpress:5-php7.3
Tagging wordpress:php7.3

$ test/run.sh wordpress:5.4.0-apache
testing wordpress:5.4.0-apache
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'wordpress-apache-run' [5/5].......passed


$ bashbrew build wordpress:5.4.0-fpm
Building bashbrew/cache:979b61c4cf52a98d10193945fdb0c8a43c208e00a88ff353629bff64527aab15 (wordpress:5.4.0-fpm)
Tagging wordpress:5.4.0-fpm
Tagging wordpress:5.4-fpm
Tagging wordpress:5-fpm
Tagging wordpress:fpm
Tagging wordpress:5.4.0-php7.3-fpm
Tagging wordpress:5.4-php7.3-fpm
Tagging wordpress:5-php7.3-fpm
Tagging wordpress:php7.3-fpm

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


$ bashbrew build wordpress:5.4.0-fpm-alpine
Building bashbrew/cache:5386f28dcd3631543f31876cbb971c0d6196592bc9377f372ece99e7f64eedb2 (wordpress:5.4.0-fpm-alpine)
Tagging wordpress:5.4.0-fpm-alpine
Tagging wordpress:5.4-fpm-alpine
Tagging wordpress:5-fpm-alpine
Tagging wordpress:fpm-alpine
Tagging wordpress:5.4.0-php7.3-fpm-alpine
Tagging wordpress:5.4-php7.3-fpm-alpine
Tagging wordpress:5-php7.3-fpm-alpine
Tagging wordpress:php7.3-fpm-alpine

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


$ bashbrew build wordpress:5.4.0-php7.4-apache
Building bashbrew/cache:8c67250433af46a376b6f74128c05f04fdc709e921f15b5160086a7bcae77c13 (wordpress:5.4.0-php7.4-apache)
Tagging wordpress:5.4.0-php7.4-apache
Tagging wordpress:5.4-php7.4-apache
Tagging wordpress:5-php7.4-apache
Tagging wordpress:php7.4-apache
Tagging wordpress:5.4.0-php7.4
Tagging wordpress:5.4-php7.4
Tagging wordpress:5-php7.4
Tagging wordpress:php7.4

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


$ bashbrew build wordpress:5.4.0-php7.4-fpm
Building bashbrew/cache:9e86a17e6965c7168bb85ae66faccdc6698c662898f4cfbd0be94e541c22e15c (wordpress:5.4.0-php7.4-fpm)
Tagging wordpress:5.4.0-php7.4-fpm
Tagging wordpress:5.4-php7.4-fpm
Tagging wordpress:5-php7.4-fpm
Tagging wordpress:php7.4-fpm

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


$ bashbrew build wordpress:5.4.0-php7.4-fpm-alpine
Building bashbrew/cache:66ebf2e6e806328242fb6316312adfd68f6a82c94c65fdb7a7cbf91b864aa2f4 (wordpress:5.4.0-php7.4-fpm-alpine)
Tagging wordpress:5.4.0-php7.4-fpm-alpine
Tagging wordpress:5.4-php7.4-fpm-alpine
Tagging wordpress:5-php7.4-fpm-alpine
Tagging wordpress:php7.4-fpm-alpine

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


$ bashbrew build wordpress:cli-2.4.0-php7.2
Building bashbrew/cache:c40a411aee83307e817d0ed2279208f03063bfc16a4f91c75f295dea8450ffe7 (wordpress:cli-2.4.0-php7.2)
Tagging wordpress:cli-2.4.0-php7.2
Tagging wordpress:cli-2.4-php7.2
Tagging wordpress:cli-2-php7.2
Tagging wordpress:cli-php7.2

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


$ bashbrew build wordpress:cli-2.4.0
Building bashbrew/cache:ad7965f8e51a832a0e9333b537a6cf16f95b44aa5729c6f8549b4e914895d38a (wordpress:cli-2.4.0)
Tagging wordpress:cli-2.4.0
Tagging wordpress:cli-2.4
Tagging wordpress:cli-2
Tagging wordpress:cli
Tagging wordpress:cli-2.4.0-php7.3
Tagging wordpress:cli-2.4-php7.3
Tagging wordpress:cli-2-php7.3
Tagging wordpress:cli-php7.3

$ test/run.sh wordpress:cli-2.4.0
testing wordpress:cli-2.4.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build wordpress:cli-2.4.0-php7.4
Building bashbrew/cache:9abc3d35e9c6cd5a678c5c9b1b20cde9df52906b81ef0a3818ac513622b4481e (wordpress:cli-2.4.0-php7.4)
Tagging wordpress:cli-2.4.0-php7.4
Tagging wordpress:cli-2.4-php7.4
Tagging wordpress:cli-2-php7.4
Tagging wordpress:cli-php7.4

$ test/run.sh wordpress:cli-2.4.0-php7.4
testing wordpress:cli-2.4.0-php7.4
	'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 7fb81eb into docker-library:master Apr 1, 2020
@yosifkit yosifkit deleted the wordpress branch April 1, 2020 23: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