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

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 30, 2023

Changes:

Changes:

- docker-library/wordpress@04e96f4: Merge pull request docker-library/wordpress#861 from swissspidy/add-php83
- docker-library/wordpress@d1cc7e6: Add PHP 8.3 Support
Copy link

Diff for e1948db:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bc61b0b..a708e72 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -46,6 +46,21 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
 Directory: latest/php8.2/fpm-alpine
 
+Tags: 6.4.1-php8.3-apache, 6.4-php8.3-apache, 6-php8.3-apache, php8.3-apache, 6.4.1-php8.3, 6.4-php8.3, 6-php8.3, php8.3
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: d1cc7e6a226cf23ade72b83990310980e7ac5c2b
+Directory: latest/php8.3/apache
+
+Tags: 6.4.1-php8.3-fpm, 6.4-php8.3-fpm, 6-php8.3-fpm, php8.3-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: d1cc7e6a226cf23ade72b83990310980e7ac5c2b
+Directory: latest/php8.3/fpm
+
+Tags: 6.4.1-php8.3-fpm-alpine, 6.4-php8.3-fpm-alpine, 6-php8.3-fpm-alpine, php8.3-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: d1cc7e6a226cf23ade72b83990310980e7ac5c2b
+Directory: latest/php8.3/fpm-alpine
+
 Tags: cli-2.9.0, cli-2.9, cli-2, cli, cli-2.9.0-php8.0, cli-2.9-php8.0, cli-2-php8.0, cli-php8.0
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 480b5c35eb6382f4ae5581cfb9dfe54873d4f4a0
@@ -60,3 +75,8 @@ Tags: cli-2.9.0-php8.2, cli-2.9-php8.2, cli-2-php8.2, cli-php8.2
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 480b5c35eb6382f4ae5581cfb9dfe54873d4f4a0
 Directory: cli/php8.2/alpine
+
+Tags: cli-2.9.0-php8.3, cli-2.9-php8.3, cli-2-php8.3, cli-php8.3
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: d1cc7e6a226cf23ade72b83990310980e7ac5c2b
+Directory: cli/php8.3/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 51f31b1..0cd137c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,6 +14,10 @@ wordpress:6-php8.2
 wordpress:6-php8.2-apache
 wordpress:6-php8.2-fpm
 wordpress:6-php8.2-fpm-alpine
+wordpress:6-php8.3
+wordpress:6-php8.3-apache
+wordpress:6-php8.3-fpm
+wordpress:6-php8.3-fpm-alpine
 wordpress:6.4
 wordpress:6.4-apache
 wordpress:6.4-fpm
@@ -30,6 +34,10 @@ wordpress:6.4-php8.2
 wordpress:6.4-php8.2-apache
 wordpress:6.4-php8.2-fpm
 wordpress:6.4-php8.2-fpm-alpine
+wordpress:6.4-php8.3
+wordpress:6.4-php8.3-apache
+wordpress:6.4-php8.3-fpm
+wordpress:6.4-php8.3-fpm-alpine
 wordpress:6.4.1
 wordpress:6.4.1-apache
 wordpress:6.4.1-fpm
@@ -46,23 +54,31 @@ wordpress:6.4.1-php8.2
 wordpress:6.4.1-php8.2-apache
 wordpress:6.4.1-php8.2-fpm
 wordpress:6.4.1-php8.2-fpm-alpine
+wordpress:6.4.1-php8.3
+wordpress:6.4.1-php8.3-apache
+wordpress:6.4.1-php8.3-fpm
+wordpress:6.4.1-php8.3-fpm-alpine
 wordpress:apache
 wordpress:cli
 wordpress:cli-2
 wordpress:cli-2-php8.0
 wordpress:cli-2-php8.1
 wordpress:cli-2-php8.2
+wordpress:cli-2-php8.3
 wordpress:cli-2.9
 wordpress:cli-2.9-php8.0
 wordpress:cli-2.9-php8.1
 wordpress:cli-2.9-php8.2
+wordpress:cli-2.9-php8.3
 wordpress:cli-2.9.0
 wordpress:cli-2.9.0-php8.0
 wordpress:cli-2.9.0-php8.1
 wordpress:cli-2.9.0-php8.2
+wordpress:cli-2.9.0-php8.3
 wordpress:cli-php8.0
 wordpress:cli-php8.1
 wordpress:cli-php8.2
+wordpress:cli-php8.3
 wordpress:fpm
 wordpress:fpm-alpine
 wordpress:latest
@@ -78,3 +94,7 @@ wordpress:php8.2
 wordpress:php8.2-apache
 wordpress:php8.2-fpm
 wordpress:php8.2-fpm-alpine
+wordpress:php8.3
+wordpress:php8.3-apache
+wordpress:php8.3-fpm
+wordpress:php8.3-fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d1964e8..71c295c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -7,6 +7,10 @@ wordpress:php8.1-fpm-alpine
 wordpress:php8.2
 wordpress:php8.2-fpm
 wordpress:php8.2-fpm-alpine
+wordpress:php8.3
+wordpress:php8.3-fpm
+wordpress:php8.3-fpm-alpine
 wordpress:cli-php8.0
 wordpress:cli-php8.1
 wordpress:cli-php8.2
+wordpress:cli-php8.3
diff --git a/wordpress_cli-php8.0/Dockerfile b/wordpress_cli-php8.3/Dockerfile
similarity index 99%
copy from wordpress_cli-php8.0/Dockerfile
copy to wordpress_cli-php8.3/Dockerfile
index af11829..7325334 100644
--- a/wordpress_cli-php8.0/Dockerfile
+++ b/wordpress_cli-php8.3/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.0-alpine
+FROM php:8.3-alpine
 
 # install wp-cli dependencies
 RUN apk add --no-cache \
diff --git a/wordpress_cli-php8.0/docker-entrypoint.sh b/wordpress_cli-php8.3/docker-entrypoint.sh
similarity index 100%
copy from wordpress_cli-php8.0/docker-entrypoint.sh
copy to wordpress_cli-php8.3/docker-entrypoint.sh
diff --git a/wordpress_php8.2-fpm-alpine/Dockerfile b/wordpress_php8.3-fpm-alpine/Dockerfile
similarity index 99%
copy from wordpress_php8.2-fpm-alpine/Dockerfile
copy to wordpress_php8.3-fpm-alpine/Dockerfile
index 7069407..cad0fd7 100644
--- a/wordpress_php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_php8.3-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.2-fpm-alpine
+FROM php:8.3-fpm-alpine
 
 # persistent dependencies
 RUN set -eux; \
diff --git a/wordpress_php8.0-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
diff --git a/wordpress_php8.0-fpm-alpine/wp-config-docker.php b/wordpress_php8.3-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.3-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.0-fpm/Dockerfile b/wordpress_php8.3-fpm/Dockerfile
similarity index 99%
copy from wordpress_php8.0-fpm/Dockerfile
copy to wordpress_php8.3-fpm/Dockerfile
index 4f59bc0..8f1a935 100644
--- a/wordpress_php8.0-fpm/Dockerfile
+++ b/wordpress_php8.3-fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.0-fpm
+FROM php:8.3-fpm
 
 # persistent dependencies
 RUN set -eux; \
diff --git a/wordpress_php8.0-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.3-fpm/docker-entrypoint.sh
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.3-fpm/docker-entrypoint.sh
diff --git a/wordpress_php8.0-fpm-alpine/wp-config-docker.php b/wordpress_php8.3-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.3-fpm/wp-config-docker.php
diff --git a/wordpress_php8.2/Dockerfile b/wordpress_php8.3/Dockerfile
similarity index 99%
copy from wordpress_php8.2/Dockerfile
copy to wordpress_php8.3/Dockerfile
index aa9c919..731dd16 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_php8.3/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.2-apache
+FROM php:8.3-apache
 
 # persistent dependencies
 RUN set -eux; \
diff --git a/wordpress_php8.0-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.3/docker-entrypoint.sh
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.3/docker-entrypoint.sh
diff --git a/wordpress_php8.0-fpm-alpine/wp-config-docker.php b/wordpress_php8.3/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.0-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.3/wp-config-docker.php

Relevant Maintainers:

@yosifkit yosifkit merged commit d85d9ae into docker-library:master Nov 30, 2023
21 checks passed
@yosifkit yosifkit deleted the wordpress branch November 30, 2023 20:24
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