Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Update wordpress #16914

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Update wordpress #16914

merged 1 commit into from
Jun 4, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 4, 2024

Changes:

@docker-library-bot
Update wordpress
53a01c7 
Changes:

- docker-library/wordpress@4d3f10a: Update beta to 6.6-beta1
@tianon tianon requested a review from a team as a code owner June 4, 2024 20:09
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 4, 2024

Diff for 53a01c7: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a043a94..649daa1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -46,49 +46,49 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 2eba26f088c12dea179623ee8af5cb52e6f60c4a
 Directory: latest/php8.3/fpm-alpine
 
-Tags: beta-6.5.4-RC1-apache, beta-6.5.4-apache, beta-6.5-apache, beta-6-apache, beta-apache, beta-6.5.4-RC1, beta-6.5.4, beta-6.5, beta-6, beta, beta-6.5.4-RC1-php8.2-apache, beta-6.5.4-php8.2-apache, beta-6.5-php8.2-apache, beta-6-php8.2-apache, beta-php8.2-apache, beta-6.5.4-RC1-php8.2, beta-6.5.4-php8.2, beta-6.5-php8.2, beta-6-php8.2, beta-php8.2
+Tags: beta-6.6-beta1-apache, beta-6.6-apache, beta-6-apache, beta-apache, beta-6.6-beta1, beta-6.6, beta-6, beta, beta-6.6-beta1-php8.2-apache, beta-6.6-php8.2-apache, beta-6-php8.2-apache, beta-php8.2-apache, beta-6.6-beta1-php8.2, beta-6.6-php8.2, beta-6-php8.2, beta-php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.2/apache
 
-Tags: beta-6.5.4-RC1-fpm, beta-6.5.4-fpm, beta-6.5-fpm, beta-6-fpm, beta-fpm, beta-6.5.4-RC1-php8.2-fpm, beta-6.5.4-php8.2-fpm, beta-6.5-php8.2-fpm, beta-6-php8.2-fpm, beta-php8.2-fpm
+Tags: beta-6.6-beta1-fpm, beta-6.6-fpm, beta-6-fpm, beta-fpm, beta-6.6-beta1-php8.2-fpm, beta-6.6-php8.2-fpm, beta-6-php8.2-fpm, beta-php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.2/fpm
 
-Tags: beta-6.5.4-RC1-fpm-alpine, beta-6.5.4-fpm-alpine, beta-6.5-fpm-alpine, beta-6-fpm-alpine, beta-fpm-alpine, beta-6.5.4-RC1-php8.2-fpm-alpine, beta-6.5.4-php8.2-fpm-alpine, beta-6.5-php8.2-fpm-alpine, beta-6-php8.2-fpm-alpine, beta-php8.2-fpm-alpine
+Tags: beta-6.6-beta1-fpm-alpine, beta-6.6-fpm-alpine, beta-6-fpm-alpine, beta-fpm-alpine, beta-6.6-beta1-php8.2-fpm-alpine, beta-6.6-php8.2-fpm-alpine, beta-6-php8.2-fpm-alpine, beta-php8.2-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.2/fpm-alpine
 
-Tags: beta-6.5.4-RC1-php8.1-apache, beta-6.5.4-php8.1-apache, beta-6.5-php8.1-apache, beta-6-php8.1-apache, beta-php8.1-apache, beta-6.5.4-RC1-php8.1, beta-6.5.4-php8.1, beta-6.5-php8.1, beta-6-php8.1, beta-php8.1
+Tags: beta-6.6-beta1-php8.1-apache, beta-6.6-php8.1-apache, beta-6-php8.1-apache, beta-php8.1-apache, beta-6.6-beta1-php8.1, beta-6.6-php8.1, beta-6-php8.1, beta-php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.1/apache
 
-Tags: beta-6.5.4-RC1-php8.1-fpm, beta-6.5.4-php8.1-fpm, beta-6.5-php8.1-fpm, beta-6-php8.1-fpm, beta-php8.1-fpm
+Tags: beta-6.6-beta1-php8.1-fpm, beta-6.6-php8.1-fpm, beta-6-php8.1-fpm, beta-php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.1/fpm
 
-Tags: beta-6.5.4-RC1-php8.1-fpm-alpine, beta-6.5.4-php8.1-fpm-alpine, beta-6.5-php8.1-fpm-alpine, beta-6-php8.1-fpm-alpine, beta-php8.1-fpm-alpine
+Tags: beta-6.6-beta1-php8.1-fpm-alpine, beta-6.6-php8.1-fpm-alpine, beta-6-php8.1-fpm-alpine, beta-php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.1/fpm-alpine
 
-Tags: beta-6.5.4-RC1-php8.3-apache, beta-6.5.4-php8.3-apache, beta-6.5-php8.3-apache, beta-6-php8.3-apache, beta-php8.3-apache, beta-6.5.4-RC1-php8.3, beta-6.5.4-php8.3, beta-6.5-php8.3, beta-6-php8.3, beta-php8.3
+Tags: beta-6.6-beta1-php8.3-apache, beta-6.6-php8.3-apache, beta-6-php8.3-apache, beta-php8.3-apache, beta-6.6-beta1-php8.3, beta-6.6-php8.3, beta-6-php8.3, beta-php8.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.3/apache
 
-Tags: beta-6.5.4-RC1-php8.3-fpm, beta-6.5.4-php8.3-fpm, beta-6.5-php8.3-fpm, beta-6-php8.3-fpm, beta-php8.3-fpm
+Tags: beta-6.6-beta1-php8.3-fpm, beta-6.6-php8.3-fpm, beta-6-php8.3-fpm, beta-php8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.3/fpm
 
-Tags: beta-6.5.4-RC1-php8.3-fpm-alpine, beta-6.5.4-php8.3-fpm-alpine, beta-6.5-php8.3-fpm-alpine, beta-6-php8.3-fpm-alpine, beta-php8.3-fpm-alpine
+Tags: beta-6.6-beta1-php8.3-fpm-alpine, beta-6.6-php8.3-fpm-alpine, beta-6-php8.3-fpm-alpine, beta-php8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a62e6724aec26ea8e48aa5adcd5de6c7300fd86d
+GitCommit: 4d3f10a0dd347140e05f271a17e4b72f9b575b3b
 Directory: beta/php8.3/fpm-alpine
 
 Tags: cli-2.10.0, cli-2.10, cli-2, cli, cli-2.10.0-php8.2, cli-2.10-php8.2, cli-2-php8.2, cli-php8.2
diff --git a/_bashbrew-list b/_bashbrew-list
index 7030aac..9571ea6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -64,54 +64,38 @@ wordpress:beta-6-php8.3
 wordpress:beta-6-php8.3-apache
 wordpress:beta-6-php8.3-fpm
 wordpress:beta-6-php8.3-fpm-alpine
-wordpress:beta-6.5
-wordpress:beta-6.5-apache
-wordpress:beta-6.5-fpm
-wordpress:beta-6.5-fpm-alpine
-wordpress:beta-6.5-php8.1
-wordpress:beta-6.5-php8.1-apache
-wordpress:beta-6.5-php8.1-fpm
-wordpress:beta-6.5-php8.1-fpm-alpine
-wordpress:beta-6.5-php8.2
-wordpress:beta-6.5-php8.2-apache
-wordpress:beta-6.5-php8.2-fpm
-wordpress:beta-6.5-php8.2-fpm-alpine
-wordpress:beta-6.5-php8.3
-wordpress:beta-6.5-php8.3-apache
-wordpress:beta-6.5-php8.3-fpm
-wordpress:beta-6.5-php8.3-fpm-alpine
-wordpress:beta-6.5.4
-wordpress:beta-6.5.4-RC1
-wordpress:beta-6.5.4-RC1-apache
-wordpress:beta-6.5.4-RC1-fpm
-wordpress:beta-6.5.4-RC1-fpm-alpine
-wordpress:beta-6.5.4-RC1-php8.1
-wordpress:beta-6.5.4-RC1-php8.1-apache
-wordpress:beta-6.5.4-RC1-php8.1-fpm
-wordpress:beta-6.5.4-RC1-php8.1-fpm-alpine
-wordpress:beta-6.5.4-RC1-php8.2
-wordpress:beta-6.5.4-RC1-php8.2-apache
-wordpress:beta-6.5.4-RC1-php8.2-fpm
-wordpress:beta-6.5.4-RC1-php8.2-fpm-alpine
-wordpress:beta-6.5.4-RC1-php8.3
-wordpress:beta-6.5.4-RC1-php8.3-apache
-wordpress:beta-6.5.4-RC1-php8.3-fpm
-wordpress:beta-6.5.4-RC1-php8.3-fpm-alpine
-wordpress:beta-6.5.4-apache
-wordpress:beta-6.5.4-fpm
-wordpress:beta-6.5.4-fpm-alpine
-wordpress:beta-6.5.4-php8.1
-wordpress:beta-6.5.4-php8.1-apache
-wordpress:beta-6.5.4-php8.1-fpm
-wordpress:beta-6.5.4-php8.1-fpm-alpine
-wordpress:beta-6.5.4-php8.2
-wordpress:beta-6.5.4-php8.2-apache
-wordpress:beta-6.5.4-php8.2-fpm
-wordpress:beta-6.5.4-php8.2-fpm-alpine
-wordpress:beta-6.5.4-php8.3
-wordpress:beta-6.5.4-php8.3-apache
-wordpress:beta-6.5.4-php8.3-fpm
-wordpress:beta-6.5.4-php8.3-fpm-alpine
+wordpress:beta-6.6
+wordpress:beta-6.6-apache
+wordpress:beta-6.6-beta1
+wordpress:beta-6.6-beta1-apache
+wordpress:beta-6.6-beta1-fpm
+wordpress:beta-6.6-beta1-fpm-alpine
+wordpress:beta-6.6-beta1-php8.1
+wordpress:beta-6.6-beta1-php8.1-apache
+wordpress:beta-6.6-beta1-php8.1-fpm
+wordpress:beta-6.6-beta1-php8.1-fpm-alpine
+wordpress:beta-6.6-beta1-php8.2
+wordpress:beta-6.6-beta1-php8.2-apache
+wordpress:beta-6.6-beta1-php8.2-fpm
+wordpress:beta-6.6-beta1-php8.2-fpm-alpine
+wordpress:beta-6.6-beta1-php8.3
+wordpress:beta-6.6-beta1-php8.3-apache
+wordpress:beta-6.6-beta1-php8.3-fpm
+wordpress:beta-6.6-beta1-php8.3-fpm-alpine
+wordpress:beta-6.6-fpm
+wordpress:beta-6.6-fpm-alpine
+wordpress:beta-6.6-php8.1
+wordpress:beta-6.6-php8.1-apache
+wordpress:beta-6.6-php8.1-fpm
+wordpress:beta-6.6-php8.1-fpm-alpine
+wordpress:beta-6.6-php8.2
+wordpress:beta-6.6-php8.2-apache
+wordpress:beta-6.6-php8.2-fpm
+wordpress:beta-6.6-php8.2-fpm-alpine
+wordpress:beta-6.6-php8.3
+wordpress:beta-6.6-php8.3-apache
+wordpress:beta-6.6-php8.3-fpm
+wordpress:beta-6.6-php8.3-fpm-alpine
 wordpress:beta-apache
 wordpress:beta-fpm
 wordpress:beta-fpm-alpine
diff --git a/wordpress_beta-php8.1-fpm-alpine/Dockerfile b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
index 177e11d..21a56f6 100644
--- a/wordpress_beta-php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
@@ -107,8 +107,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm/Dockerfile b/wordpress_beta-php8.1-fpm/Dockerfile
index 544df50..4b02ac9 100644
--- a/wordpress_beta-php8.1-fpm/Dockerfile
+++ b/wordpress_beta-php8.1-fpm/Dockerfile
@@ -111,8 +111,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1/Dockerfile b/wordpress_beta-php8.1/Dockerfile
index 07d1ec6..47a3368 100644
--- a/wordpress_beta-php8.1/Dockerfile
+++ b/wordpress_beta-php8.1/Dockerfile
@@ -130,8 +130,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2-fpm-alpine/Dockerfile b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
index 3d112ff..65a9273 100644
--- a/wordpress_beta-php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
@@ -107,8 +107,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2-fpm/Dockerfile b/wordpress_beta-php8.2-fpm/Dockerfile
index a83a0c2..67a37e2 100644
--- a/wordpress_beta-php8.2-fpm/Dockerfile
+++ b/wordpress_beta-php8.2-fpm/Dockerfile
@@ -111,8 +111,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2/Dockerfile b/wordpress_beta-php8.2/Dockerfile
index 2162084..d1a4f86 100644
--- a/wordpress_beta-php8.2/Dockerfile
+++ b/wordpress_beta-php8.2/Dockerfile
@@ -130,8 +130,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3-fpm-alpine/Dockerfile b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
index 92934cc..ac2df69 100644
--- a/wordpress_beta-php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
@@ -107,8 +107,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3-fpm/Dockerfile b/wordpress_beta-php8.3-fpm/Dockerfile
index 26f9b89..066ba3a 100644
--- a/wordpress_beta-php8.3-fpm/Dockerfile
+++ b/wordpress_beta-php8.3-fpm/Dockerfile
@@ -111,8 +111,8 @@ RUN { \
 	} > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3/Dockerfile b/wordpress_beta-php8.3/Dockerfile
index 729820f..96373a9 100644
--- a/wordpress_beta-php8.3/Dockerfile
+++ b/wordpress_beta-php8.3/Dockerfile
@@ -130,8 +130,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.5.4-RC1'; \
-	sha1='b7ac6fe516d412e9ff6a9c65594d0c763817c05c'; \
+	version='6.6-beta1'; \
+	sha1='5e39f04283811ae3ed58e9b893e161798b9ec0e0'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \

Relevant Maintainers:

@yosifkit
Copy link
Member

yosifkit commented Jun 4, 2024

🤔The beta images are moving to 6.6 https://make.wordpress.org/core/6-6/#release-schedule. 6.5.4 release is scheduled for tomorrow: https://make.wordpress.org/core/2024/05/24/wordpress-6-5-4-an-upcoming-maintenance-release/#content; any reason to wait for 6.5.4?

@tianon
Copy link
Member Author

tianon commented Jun 4, 2024

Nope -- they maintain a lot of older versions very aggressively, but we don't maintain builds of any of them (docker-library/wordpress#701 (comment)), so unless they put it out before the GA of 6.6, I don't think we should worry about it too much.

@tianon tianon merged commit 722c948 into docker-library:master Jun 4, 2024
26 checks passed
@tianon tianon deleted the wordpress branch June 4, 2024 23:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/wordpress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot