-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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 #6177
Merged
Merged
Update wordpress #6177
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@8c2cc35: Merge pull request docker-library/wordpress#408 from J0WI/opcache-cli - docker-library/wordpress@73a28f6: Adjust comment for cli variant - docker-library/wordpress@d549b27: Drop opcache from cli actions
Diff:diff --git a/wordpress_cli-php7.1/Dockerfile b/wordpress_cli-php7.1/Dockerfile
index 801b017..fa51bf8 100644
--- a/wordpress_cli-php7.1/Dockerfile
+++ b/wordpress_cli-php7.1/Dockerfile
@@ -16,7 +16,6 @@ RUN set -ex; \
exif \
gd \
mysqli \
- opcache \
zip \
; \
pecl install imagick-3.4.4; \
@@ -32,15 +31,7 @@ RUN set -ex; \
apk del .build-deps
# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=4000'; \
- echo 'opcache.revalidate_freq=2'; \
- echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini
+# excluding opcache due https://github.com/docker-library/wordpress/issues/407
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
echo 'error_reporting = 4339'; \
diff --git a/wordpress_cli-php7.2/Dockerfile b/wordpress_cli-php7.2/Dockerfile
index a109332..df143d8 100644
--- a/wordpress_cli-php7.2/Dockerfile
+++ b/wordpress_cli-php7.2/Dockerfile
@@ -16,7 +16,6 @@ RUN set -ex; \
exif \
gd \
mysqli \
- opcache \
zip \
; \
pecl install imagick-3.4.4; \
@@ -32,15 +31,7 @@ RUN set -ex; \
apk del .build-deps
# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=4000'; \
- echo 'opcache.revalidate_freq=2'; \
- echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini
+# excluding opcache due https://github.com/docker-library/wordpress/issues/407
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
echo 'error_reporting = 4339'; \
diff --git a/wordpress_cli-php7.3/Dockerfile b/wordpress_cli-php7.3/Dockerfile
index 15213aa..9335440 100644
--- a/wordpress_cli-php7.3/Dockerfile
+++ b/wordpress_cli-php7.3/Dockerfile
@@ -17,7 +17,6 @@ RUN set -ex; \
exif \
gd \
mysqli \
- opcache \
zip \
; \
pecl install imagick-3.4.4; \
@@ -33,15 +32,7 @@ RUN set -ex; \
apk del .build-deps
# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=4000'; \
- echo 'opcache.revalidate_freq=2'; \
- echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini
+# excluding opcache due https://github.com/docker-library/wordpress/issues/407
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
echo 'error_reporting = 4339'; \
diff --git a/wordpress_php7.1-fpm-alpine/Dockerfile b/wordpress_php7.1-fpm-alpine/Dockerfile
index 745d6b2..94725ee 100644
--- a/wordpress_php7.1-fpm-alpine/Dockerfile
+++ b/wordpress_php7.1-fpm-alpine/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.1-fpm/Dockerfile b/wordpress_php7.1-fpm/Dockerfile
index 270c418..c6063fe 100644
--- a/wordpress_php7.1-fpm/Dockerfile
+++ b/wordpress_php7.1-fpm/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.1/Dockerfile b/wordpress_php7.1/Dockerfile
index 07e2f7c..a06cbe7 100644
--- a/wordpress_php7.1/Dockerfile
+++ b/wordpress_php7.1/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.2-fpm-alpine/Dockerfile b/wordpress_php7.2-fpm-alpine/Dockerfile
index 8a13987..67b7be8 100644
--- a/wordpress_php7.2-fpm-alpine/Dockerfile
+++ b/wordpress_php7.2-fpm-alpine/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.2-fpm/Dockerfile b/wordpress_php7.2-fpm/Dockerfile
index 7208ac8..9447344 100644
--- a/wordpress_php7.2-fpm/Dockerfile
+++ b/wordpress_php7.2-fpm/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.2/Dockerfile b/wordpress_php7.2/Dockerfile
index 9d4e12d..0177597 100644
--- a/wordpress_php7.2/Dockerfile
+++ b/wordpress_php7.2/Dockerfile
@@ -46,7 +46,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.3-fpm-alpine/Dockerfile b/wordpress_php7.3-fpm-alpine/Dockerfile
index 40f6d2c..9d410f8 100644
--- a/wordpress_php7.3-fpm-alpine/Dockerfile
+++ b/wordpress_php7.3-fpm-alpine/Dockerfile
@@ -47,7 +47,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.3-fpm/Dockerfile b/wordpress_php7.3-fpm/Dockerfile
index af75609..53b2a8d 100644
--- a/wordpress_php7.3-fpm/Dockerfile
+++ b/wordpress_php7.3-fpm/Dockerfile
@@ -47,7 +47,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \
diff --git a/wordpress_php7.3/Dockerfile b/wordpress_php7.3/Dockerfile
index 636b894..9a05daa 100644
--- a/wordpress_php7.3/Dockerfile
+++ b/wordpress_php7.3/Dockerfile
@@ -47,7 +47,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
# https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging
RUN { \ |
Build test of #6177; 7ade637; $ bashbrew build wordpress:5.2.2-php7.1-apache
Building bashbrew/cache:52c6527a88e1ed1772e28e729288dee7cffc5638c4603213a743513e3b5c98cc (wordpress:5.2.2-php7.1-apache)
Tagging wordpress:5.2.2-php7.1-apache
Tagging wordpress:5.2-php7.1-apache
Tagging wordpress:5-php7.1-apache
Tagging wordpress:php7.1-apache
Tagging wordpress:5.2.2-php7.1
Tagging wordpress:5.2-php7.1
Tagging wordpress:5-php7.1
Tagging wordpress:php7.1
$ test/run.sh wordpress:5.2.2-php7.1-apache
testing wordpress:5.2.2-php7.1-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.2.2-php7.1-fpm
Building bashbrew/cache:de26e50fc1c58a75dc6e2e3d2adedcd2294598b3221e5f794f26809146dbe4ec (wordpress:5.2.2-php7.1-fpm)
Tagging wordpress:5.2.2-php7.1-fpm
Tagging wordpress:5.2-php7.1-fpm
Tagging wordpress:5-php7.1-fpm
Tagging wordpress:php7.1-fpm
$ test/run.sh wordpress:5.2.2-php7.1-fpm
testing wordpress:5.2.2-php7.1-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.2.2-php7.1-fpm-alpine
Building bashbrew/cache:d15bcce10951fc1db2464a8040ec0526c3baffdc21aa1c357bd0bf4df86aade8 (wordpress:5.2.2-php7.1-fpm-alpine)
Tagging wordpress:5.2.2-php7.1-fpm-alpine
Tagging wordpress:5.2-php7.1-fpm-alpine
Tagging wordpress:5-php7.1-fpm-alpine
Tagging wordpress:php7.1-fpm-alpine
$ test/run.sh wordpress:5.2.2-php7.1-fpm-alpine
testing wordpress:5.2.2-php7.1-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.2.2-php7.2-apache
Building bashbrew/cache:c62c79e8cc8e2ed1fe339a392450418153c3a5b77224f68f831f84d6b7193a9a (wordpress:5.2.2-php7.2-apache)
Tagging wordpress:5.2.2-php7.2-apache
Tagging wordpress:5.2-php7.2-apache
Tagging wordpress:5-php7.2-apache
Tagging wordpress:php7.2-apache
Tagging wordpress:5.2.2-php7.2
Tagging wordpress:5.2-php7.2
Tagging wordpress:5-php7.2
Tagging wordpress:php7.2
$ test/run.sh wordpress:5.2.2-php7.2-apache
testing wordpress:5.2.2-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.2.2-php7.2-fpm
Building bashbrew/cache:9a9031de4d36c61512bed331c662a04cf5c217f1eb15ea9631f377469e4c4630 (wordpress:5.2.2-php7.2-fpm)
Tagging wordpress:5.2.2-php7.2-fpm
Tagging wordpress:5.2-php7.2-fpm
Tagging wordpress:5-php7.2-fpm
Tagging wordpress:php7.2-fpm
$ test/run.sh wordpress:5.2.2-php7.2-fpm
testing wordpress:5.2.2-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.2.2-php7.2-fpm-alpine
Building bashbrew/cache:7e05852216e7078769964705a6c07b75cb16248a9297026e604d7d59e4a684e1 (wordpress:5.2.2-php7.2-fpm-alpine)
Tagging wordpress:5.2.2-php7.2-fpm-alpine
Tagging wordpress:5.2-php7.2-fpm-alpine
Tagging wordpress:5-php7.2-fpm-alpine
Tagging wordpress:php7.2-fpm-alpine
$ test/run.sh wordpress:5.2.2-php7.2-fpm-alpine
testing wordpress:5.2.2-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.2.2-apache
Building bashbrew/cache:0d22050b3c2a13b9e9419cc1e130d0bc19db238b69ca5fb4fdd0edc8c91d72f3 (wordpress:5.2.2-apache)
Tagging wordpress:5.2.2-apache
Tagging wordpress:5.2-apache
Tagging wordpress:5-apache
Tagging wordpress:apache
Tagging wordpress:5.2.2
Tagging wordpress:5.2
Tagging wordpress:5
Tagging wordpress:latest
Tagging wordpress:5.2.2-php7.3-apache
Tagging wordpress:5.2-php7.3-apache
Tagging wordpress:5-php7.3-apache
Tagging wordpress:php7.3-apache
Tagging wordpress:5.2.2-php7.3
Tagging wordpress:5.2-php7.3
Tagging wordpress:5-php7.3
Tagging wordpress:php7.3
$ test/run.sh wordpress:5.2.2-apache
testing wordpress:5.2.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.2.2-fpm
Building bashbrew/cache:a0eb148768030d5195c511113a4eb986209b9a0789ce3ebd40fd724d8a1514f8 (wordpress:5.2.2-fpm)
Tagging wordpress:5.2.2-fpm
Tagging wordpress:5.2-fpm
Tagging wordpress:5-fpm
Tagging wordpress:fpm
Tagging wordpress:5.2.2-php7.3-fpm
Tagging wordpress:5.2-php7.3-fpm
Tagging wordpress:5-php7.3-fpm
Tagging wordpress:php7.3-fpm
$ test/run.sh wordpress:5.2.2-fpm
testing wordpress:5.2.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.2.2-fpm-alpine
Building bashbrew/cache:c0bc4e252bc85e02089f18321ad391620aa40021ef362b6ed3cf30121336c285 (wordpress:5.2.2-fpm-alpine)
Tagging wordpress:5.2.2-fpm-alpine
Tagging wordpress:5.2-fpm-alpine
Tagging wordpress:5-fpm-alpine
Tagging wordpress:fpm-alpine
Tagging wordpress:5.2.2-php7.3-fpm-alpine
Tagging wordpress:5.2-php7.3-fpm-alpine
Tagging wordpress:5-php7.3-fpm-alpine
Tagging wordpress:php7.3-fpm-alpine
$ test/run.sh wordpress:5.2.2-fpm-alpine
testing wordpress:5.2.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:cli-2.2.0-php7.1
Building bashbrew/cache:20947fa85d39fa3ef449a182c0f5f465fcd57b617a2c40f8ec10cd644313b0c4 (wordpress:cli-2.2.0-php7.1)
Tagging wordpress:cli-2.2.0-php7.1
Tagging wordpress:cli-2.2-php7.1
Tagging wordpress:cli-2-php7.1
Tagging wordpress:cli-php7.1
$ test/run.sh wordpress:cli-2.2.0-php7.1
testing wordpress:cli-2.2.0-php7.1
'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.2.0-php7.2
Building bashbrew/cache:eefbc750e5c2e253a32b46aaf52afa524126119544df168d661e4962ac6c5300 (wordpress:cli-2.2.0-php7.2)
Tagging wordpress:cli-2.2.0-php7.2
Tagging wordpress:cli-2.2-php7.2
Tagging wordpress:cli-2-php7.2
Tagging wordpress:cli-php7.2
$ test/run.sh wordpress:cli-2.2.0-php7.2
testing wordpress:cli-2.2.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.2.0
Building bashbrew/cache:ef4274813ddefbb8d9c15e7560dda08bb0ebdfe130c69a6889409a7252fbd8c5 (wordpress:cli-2.2.0)
Tagging wordpress:cli-2.2.0
Tagging wordpress:cli-2.2
Tagging wordpress:cli-2
Tagging wordpress:cli
Tagging wordpress:cli-2.2.0-php7.3
Tagging wordpress:cli-2.2-php7.3
Tagging wordpress:cli-2-php7.3
Tagging wordpress:cli-php7.3
$ test/run.sh wordpress:cli-2.2.0
testing wordpress:cli-2.2.0
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
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: