From d549b27bbd488c14245c4936c46b0dc7f6728e7e Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 26 Jun 2019 00:35:41 +0200 Subject: [PATCH] Drop opcache from cli actions --- Dockerfile-alpine.template | 1 - Dockerfile-cli.template | 11 ----------- Dockerfile-debian.template | 1 - php7.1/apache/Dockerfile | 1 - php7.1/cli/Dockerfile | 11 ----------- php7.1/fpm-alpine/Dockerfile | 1 - php7.1/fpm/Dockerfile | 1 - php7.2/apache/Dockerfile | 1 - php7.2/cli/Dockerfile | 11 ----------- php7.2/fpm-alpine/Dockerfile | 1 - php7.2/fpm/Dockerfile | 1 - php7.3/apache/Dockerfile | 1 - php7.3/cli/Dockerfile | 11 ----------- php7.3/fpm-alpine/Dockerfile | 1 - php7.3/fpm/Dockerfile | 1 - 15 files changed, 55 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index bc4730ea00..1abe1382c8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -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/Dockerfile-cli.template b/Dockerfile-cli.template index 0b687ec4b2..e6a01827ce 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -17,7 +17,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -32,16 +31,6 @@ RUN set -ex; \ apk add --virtual .wordpress-phpexts-rundeps $runDeps; \ 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 # https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging RUN { \ echo 'error_reporting = 4339'; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9faf3338c0..262afc5fa9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -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/php7.1/apache/Dockerfile b/php7.1/apache/Dockerfile index 07e2f7cbc6..a06cbe708e 100644 --- a/php7.1/apache/Dockerfile +++ b/php7.1/apache/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/php7.1/cli/Dockerfile b/php7.1/cli/Dockerfile index 801b017cf8..84115b7815 100644 --- a/php7.1/cli/Dockerfile +++ b/php7.1/cli/Dockerfile @@ -16,7 +16,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -31,16 +30,6 @@ RUN set -ex; \ apk add --virtual .wordpress-phpexts-rundeps $runDeps; \ 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 # https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging RUN { \ echo 'error_reporting = 4339'; \ diff --git a/php7.1/fpm-alpine/Dockerfile b/php7.1/fpm-alpine/Dockerfile index 745d6b2bed..94725ee3b6 100644 --- a/php7.1/fpm-alpine/Dockerfile +++ b/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/php7.1/fpm/Dockerfile b/php7.1/fpm/Dockerfile index 270c4185c7..c6063fe01a 100644 --- a/php7.1/fpm/Dockerfile +++ b/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/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile index 9d4e12d1f1..0177597b8b 100644 --- a/php7.2/apache/Dockerfile +++ b/php7.2/apache/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/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile index a109332df0..dec0131a8f 100644 --- a/php7.2/cli/Dockerfile +++ b/php7.2/cli/Dockerfile @@ -16,7 +16,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -31,16 +30,6 @@ RUN set -ex; \ apk add --virtual .wordpress-phpexts-rundeps $runDeps; \ 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 # https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging RUN { \ echo 'error_reporting = 4339'; \ diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index 8a13987242..67b7be8c58 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/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/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile index 7208ac8326..94473449d6 100644 --- a/php7.2/fpm/Dockerfile +++ b/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/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index 636b8940f2..9a05daa3c0 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/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/php7.3/cli/Dockerfile b/php7.3/cli/Dockerfile index 15213aaf48..d5b30aaead 100644 --- a/php7.3/cli/Dockerfile +++ b/php7.3/cli/Dockerfile @@ -17,7 +17,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -32,16 +31,6 @@ RUN set -ex; \ apk add --virtual .wordpress-phpexts-rundeps $runDeps; \ 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 # https://codex.wordpress.org/Editing_wp-config.php#Configure_Error_Logging RUN { \ echo 'error_reporting = 4339'; \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index 40f6d2c708..9d410f8684 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/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/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index af756098f1..53b2a8d8f0 100644 --- a/php7.3/fpm/Dockerfile +++ b/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 { \