Merged
Conversation
Changes: - docker-library/wordpress@86753ab: Resync "wp-config-docker" with upstream "wp-config-sample" - docker-library/wordpress@304fa4f: Merge pull request docker-library/wordpress#863 from infosiftr/php8.0-eol - docker-library/wordpress@4167968: Remove php8.0 variants as it has reached end of life
Diff for c3b41e0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index a708e72..6431598 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,81 +1,61 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/wordpress.git
-Tags: 6.4.1-apache, 6.4-apache, 6-apache, apache, 6.4.1, 6.4, 6, latest, 6.4.1-php8.0-apache, 6.4-php8.0-apache, 6-php8.0-apache, php8.0-apache, 6.4.1-php8.0, 6.4-php8.0, 6-php8.0, php8.0
+Tags: 6.4.1-apache, 6.4-apache, 6-apache, apache, 6.4.1, 6.4, 6, latest, 6.4.1-php8.2-apache, 6.4-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.4.1-php8.2, 6.4-php8.2, 6-php8.2, php8.2
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
-Directory: latest/php8.0/apache
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
+Directory: latest/php8.2/apache
-Tags: 6.4.1-fpm, 6.4-fpm, 6-fpm, fpm, 6.4.1-php8.0-fpm, 6.4-php8.0-fpm, 6-php8.0-fpm, php8.0-fpm
+Tags: 6.4.1-fpm, 6.4-fpm, 6-fpm, fpm, 6.4.1-php8.2-fpm, 6.4-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
-Directory: latest/php8.0/fpm
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
+Directory: latest/php8.2/fpm
-Tags: 6.4.1-fpm-alpine, 6.4-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.4.1-php8.0-fpm-alpine, 6.4-php8.0-fpm-alpine, 6-php8.0-fpm-alpine, php8.0-fpm-alpine
+Tags: 6.4.1-fpm-alpine, 6.4-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.4.1-php8.2-fpm-alpine, 6.4-php8.2-fpm-alpine, 6-php8.2-fpm-alpine, php8.2-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
-Directory: latest/php8.0/fpm-alpine
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
+Directory: latest/php8.2/fpm-alpine
Tags: 6.4.1-php8.1-apache, 6.4-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.4.1-php8.1, 6.4-php8.1, 6-php8.1, php8.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
Directory: latest/php8.1/apache
Tags: 6.4.1-php8.1-fpm, 6.4-php8.1-fpm, 6-php8.1-fpm, php8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
Directory: latest/php8.1/fpm
Tags: 6.4.1-php8.1-fpm-alpine, 6.4-php8.1-fpm-alpine, 6-php8.1-fpm-alpine, php8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
Directory: latest/php8.1/fpm-alpine
-Tags: 6.4.1-php8.2-apache, 6.4-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.4.1-php8.2, 6.4-php8.2, 6-php8.2, php8.2
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
-Directory: latest/php8.2/apache
-
-Tags: 6.4.1-php8.2-fpm, 6.4-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4b4966247eb33c6c219cf682f1750ed5685d21c9
-Directory: latest/php8.2/fpm
-
-Tags: 6.4.1-php8.2-fpm-alpine, 6.4-php8.2-fpm-alpine, 6-php8.2-fpm-alpine, php8.2-fpm-alpine
-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
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
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
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
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
+GitCommit: 86753ab5151bc5bbb49f370f519d4c5e531e2df7
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
+Tags: cli-2.9.0, cli-2.9, cli-2, cli, 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.0/alpine
+Directory: cli/php8.2/alpine
Tags: cli-2.9.0-php8.1, cli-2.9-php8.1, cli-2-php8.1, cli-php8.1
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 480b5c35eb6382f4ae5581cfb9dfe54873d4f4a0
Directory: cli/php8.1/alpine
-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
diff --git a/_bashbrew-list b/_bashbrew-list
index 0cd137c..d8f0ce0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,10 +2,6 @@ wordpress:6
wordpress:6-apache
wordpress:6-fpm
wordpress:6-fpm-alpine
-wordpress:6-php8.0
-wordpress:6-php8.0-apache
-wordpress:6-php8.0-fpm
-wordpress:6-php8.0-fpm-alpine
wordpress:6-php8.1
wordpress:6-php8.1-apache
wordpress:6-php8.1-fpm
@@ -22,10 +18,6 @@ wordpress:6.4
wordpress:6.4-apache
wordpress:6.4-fpm
wordpress:6.4-fpm-alpine
-wordpress:6.4-php8.0
-wordpress:6.4-php8.0-apache
-wordpress:6.4-php8.0-fpm
-wordpress:6.4-php8.0-fpm-alpine
wordpress:6.4-php8.1
wordpress:6.4-php8.1-apache
wordpress:6.4-php8.1-fpm
@@ -42,10 +34,6 @@ wordpress:6.4.1
wordpress:6.4.1-apache
wordpress:6.4.1-fpm
wordpress:6.4.1-fpm-alpine
-wordpress:6.4.1-php8.0
-wordpress:6.4.1-php8.0-apache
-wordpress:6.4.1-php8.0-fpm
-wordpress:6.4.1-php8.0-fpm-alpine
wordpress:6.4.1-php8.1
wordpress:6.4.1-php8.1-apache
wordpress:6.4.1-php8.1-fpm
@@ -61,31 +49,23 @@ 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
-wordpress:php8.0
-wordpress:php8.0-apache
-wordpress:php8.0-fpm
-wordpress:php8.0-fpm-alpine
wordpress:php8.1
wordpress:php8.1-apache
wordpress:php8.1-fpm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 71c295c..7d330fd 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,16 +1,12 @@
-wordpress:php8.0
-wordpress:php8.0-fpm
-wordpress:php8.0-fpm-alpine
-wordpress:php8.1
-wordpress:php8.1-fpm
-wordpress:php8.1-fpm-alpine
wordpress:php8.2
wordpress:php8.2-fpm
wordpress:php8.2-fpm-alpine
+wordpress:php8.1
+wordpress:php8.1-fpm
+wordpress:php8.1-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.1
wordpress:cli-php8.3
diff --git a/wordpress_cli-php8.0/Dockerfile b/wordpress_cli-php8.0/Dockerfile
deleted file mode 100644
index af11829..0000000
diff --git a/wordpress_cli-php8.0/docker-entrypoint.sh b/wordpress_cli-php8.0/docker-entrypoint.sh
deleted file mode 100755
index b0f77db..0000000
diff --git a/wordpress_php8.0-fpm-alpine/Dockerfile b/wordpress_php8.0-fpm-alpine/Dockerfile
deleted file mode 100644
index efa4883..0000000
diff --git a/wordpress_php8.0-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.0-fpm-alpine/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php8.0-fpm-alpine/wp-config-docker.php b/wordpress_php8.0-fpm-alpine/wp-config-docker.php
deleted file mode 100644
index 7e7472c..0000000
diff --git a/wordpress_php8.0-fpm/Dockerfile b/wordpress_php8.0-fpm/Dockerfile
deleted file mode 100644
index 4f59bc0..0000000
diff --git a/wordpress_php8.0-fpm/docker-entrypoint.sh b/wordpress_php8.0-fpm/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php8.0-fpm/wp-config-docker.php b/wordpress_php8.0-fpm/wp-config-docker.php
deleted file mode 100644
index 7e7472c..0000000
diff --git a/wordpress_php8.0/Dockerfile b/wordpress_php8.0/Dockerfile
deleted file mode 100644
index 66cdcd6..0000000
diff --git a/wordpress_php8.0/docker-entrypoint.sh b/wordpress_php8.0/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php8.0/wp-config-docker.php b/wordpress_php8.0/wp-config-docker.php
deleted file mode 100644
index 7e7472c..0000000
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_php8.1-fpm-alpine/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.1-fpm-alpine/wp-config-docker.php
+++ b/wordpress_php8.1-fpm-alpine/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.1-fpm/wp-config-docker.php b/wordpress_php8.1-fpm/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.1-fpm/wp-config-docker.php
+++ b/wordpress_php8.1-fpm/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.1/wp-config-docker.php b/wordpress_php8.1/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.1/wp-config-docker.php
+++ b/wordpress_php8.1/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.2-fpm-alpine/wp-config-docker.php b/wordpress_php8.2-fpm-alpine/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.2-fpm-alpine/wp-config-docker.php
+++ b/wordpress_php8.2-fpm-alpine/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.2-fpm/wp-config-docker.php b/wordpress_php8.2-fpm/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.2-fpm/wp-config-docker.php
+++ b/wordpress_php8.2-fpm/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.2/wp-config-docker.php b/wordpress_php8.2/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.2/wp-config-docker.php
+++ b/wordpress_php8.2/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.3-fpm-alpine/wp-config-docker.php b/wordpress_php8.3-fpm-alpine/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.3-fpm-alpine/wp-config-docker.php
+++ b/wordpress_php8.3-fpm-alpine/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.3-fpm/wp-config-docker.php b/wordpress_php8.3-fpm/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.3-fpm/wp-config-docker.php
+++ b/wordpress_php8.3-fpm/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:
diff --git a/wordpress_php8.3/wp-config-docker.php b/wordpress_php8.3/wp-config-docker.php
index 7e7472c..9cd3bab 100644
--- a/wordpress_php8.3/wp-config-docker.php
+++ b/wordpress_php8.3/wp-config-docker.php
@@ -3,7 +3,7 @@
* The base configuration for WordPress
*
* The wp-config.php creation script uses this file during the installation.
- * You don't have to use the web site, you can copy this file to "wp-config.php"
+ * You don't have to use the website, you can copy this file to "wp-config.php"
* and fill in the values.
*
* This file contains the following configurations:Relevant Maintainers: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: