Update wordpress #13624
Merged
Update wordpress #13624
Conversation
This file contains 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
Changes: - docker-library/wordpress@69b6ba6: Merge pull request docker-library/wordpress#775 from infosiftr/php7.4eol - docker-library/wordpress@9805367: Remove EOL PHP 7.4 and update default version (conservatively) to 8.0 - docker-library/wordpress@2da4702: Use new "bashbrew" composite action
Diff for 701bd49:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6905be6..0f12564 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,32 +1,17 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/wordpress.git
-Tags: 6.1.1-apache, 6.1-apache, 6-apache, apache, 6.1.1, 6.1, 6, latest, 6.1.1-php7.4-apache, 6.1-php7.4-apache, 6-php7.4-apache, php7.4-apache, 6.1.1-php7.4, 6.1-php7.4, 6-php7.4, php7.4
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
-Directory: latest/php7.4/apache
-
-Tags: 6.1.1-fpm, 6.1-fpm, 6-fpm, fpm, 6.1.1-php7.4-fpm, 6.1-php7.4-fpm, 6-php7.4-fpm, php7.4-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
-Directory: latest/php7.4/fpm
-
-Tags: 6.1.1-fpm-alpine, 6.1-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.1.1-php7.4-fpm-alpine, 6.1-php7.4-fpm-alpine, 6-php7.4-fpm-alpine, php7.4-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
-Directory: latest/php7.4/fpm-alpine
-
-Tags: 6.1.1-php8.0-apache, 6.1-php8.0-apache, 6-php8.0-apache, php8.0-apache, 6.1.1-php8.0, 6.1-php8.0, 6-php8.0, php8.0
+Tags: 6.1.1-apache, 6.1-apache, 6-apache, apache, 6.1.1, 6.1, 6, latest, 6.1.1-php8.0-apache, 6.1-php8.0-apache, 6-php8.0-apache, php8.0-apache, 6.1.1-php8.0, 6.1-php8.0, 6-php8.0, php8.0
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
Directory: latest/php8.0/apache
-Tags: 6.1.1-php8.0-fpm, 6.1-php8.0-fpm, 6-php8.0-fpm, php8.0-fpm
+Tags: 6.1.1-fpm, 6.1-fpm, 6-fpm, fpm, 6.1.1-php8.0-fpm, 6.1-php8.0-fpm, 6-php8.0-fpm, php8.0-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
Directory: latest/php8.0/fpm
-Tags: 6.1.1-php8.0-fpm-alpine, 6.1-php8.0-fpm-alpine, 6-php8.0-fpm-alpine, php8.0-fpm-alpine
+Tags: 6.1.1-fpm-alpine, 6.1-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.1.1-php8.0-fpm-alpine, 6.1-php8.0-fpm-alpine, 6-php8.0-fpm-alpine, php8.0-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
Directory: latest/php8.0/fpm-alpine
@@ -46,12 +31,7 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 97f75b51f909fbd9894d128ea6893120cfd23979
Directory: latest/php8.1/fpm-alpine
-Tags: cli-2.7.1, cli-2.7, cli-2, cli, cli-2.7.1-php7.4, cli-2.7-php7.4, cli-2-php7.4, cli-php7.4
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b95184001fd181d86d4a409a4ae26b23795bb0d4
-Directory: cli/php7.4/alpine
-
-Tags: cli-2.7.1-php8.0, cli-2.7-php8.0, cli-2-php8.0, cli-php8.0
+Tags: cli-2.7.1, cli-2.7, cli-2, cli, cli-2.7.1-php8.0, cli-2.7-php8.0, cli-2-php8.0, cli-php8.0
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: b95184001fd181d86d4a409a4ae26b23795bb0d4
Directory: cli/php8.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 8008279..3113088 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-php7.4
-wordpress:6-php7.4-apache
-wordpress:6-php7.4-fpm
-wordpress:6-php7.4-fpm-alpine
wordpress:6-php8.0
wordpress:6-php8.0-apache
wordpress:6-php8.0-fpm
@@ -18,10 +14,6 @@ wordpress:6.1
wordpress:6.1-apache
wordpress:6.1-fpm
wordpress:6.1-fpm-alpine
-wordpress:6.1-php7.4
-wordpress:6.1-php7.4-apache
-wordpress:6.1-php7.4-fpm
-wordpress:6.1-php7.4-fpm-alpine
wordpress:6.1-php8.0
wordpress:6.1-php8.0-apache
wordpress:6.1-php8.0-fpm
@@ -34,10 +26,6 @@ wordpress:6.1.1
wordpress:6.1.1-apache
wordpress:6.1.1-fpm
wordpress:6.1.1-fpm-alpine
-wordpress:6.1.1-php7.4
-wordpress:6.1.1-php7.4-apache
-wordpress:6.1.1-php7.4-fpm
-wordpress:6.1.1-php7.4-fpm-alpine
wordpress:6.1.1-php8.0
wordpress:6.1.1-php8.0-apache
wordpress:6.1.1-php8.0-fpm
@@ -49,27 +37,19 @@ wordpress:6.1.1-php8.1-fpm-alpine
wordpress:apache
wordpress:cli
wordpress:cli-2
-wordpress:cli-2-php7.4
wordpress:cli-2-php8.0
wordpress:cli-2-php8.1
wordpress:cli-2.7
-wordpress:cli-2.7-php7.4
wordpress:cli-2.7-php8.0
wordpress:cli-2.7-php8.1
wordpress:cli-2.7.1
-wordpress:cli-2.7.1-php7.4
wordpress:cli-2.7.1-php8.0
wordpress:cli-2.7.1-php8.1
-wordpress:cli-php7.4
wordpress:cli-php8.0
wordpress:cli-php8.1
wordpress:fpm
wordpress:fpm-alpine
wordpress:latest
-wordpress:php7.4
-wordpress:php7.4-apache
-wordpress:php7.4-fpm
-wordpress:php7.4-fpm-alpine
wordpress:php8.0
wordpress:php8.0-apache
wordpress:php8.0-fpm
diff --git a/wordpress_cli-php7.4/Dockerfile b/wordpress_cli-php7.4/Dockerfile
deleted file mode 100644
index 253e891..0000000
diff --git a/wordpress_cli-php7.4/docker-entrypoint.sh b/wordpress_cli-php7.4/docker-entrypoint.sh
deleted file mode 100755
index b0f77db..0000000
diff --git a/wordpress_php7.4-fpm-alpine/Dockerfile b/wordpress_php7.4-fpm-alpine/Dockerfile
deleted file mode 100644
index 2ce83fb..0000000
diff --git a/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh b/wordpress_php7.4-fpm-alpine/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php7.4-fpm-alpine/wp-config-docker.php b/wordpress_php7.4-fpm-alpine/wp-config-docker.php
deleted file mode 100644
index f62fc1f..0000000
diff --git a/wordpress_php7.4-fpm/Dockerfile b/wordpress_php7.4-fpm/Dockerfile
deleted file mode 100644
index deded25..0000000
diff --git a/wordpress_php7.4-fpm/docker-entrypoint.sh b/wordpress_php7.4-fpm/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php7.4-fpm/wp-config-docker.php b/wordpress_php7.4-fpm/wp-config-docker.php
deleted file mode 100644
index f62fc1f..0000000
diff --git a/wordpress_php7.4/Dockerfile b/wordpress_php7.4/Dockerfile
deleted file mode 100644
index 48bc7f4..0000000
diff --git a/wordpress_php7.4/docker-entrypoint.sh b/wordpress_php7.4/docker-entrypoint.sh
deleted file mode 100755
index 1034f1d..0000000
diff --git a/wordpress_php7.4/wp-config-docker.php b/wordpress_php7.4/wp-config-docker.php
deleted file mode 100644
index f62fc1f..0000000Relevant Maintainers: |
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: