From def14e3e6e6a376dcfb856f9eb542e3e399457af Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 25 Jun 2020 11:14:12 -0700 Subject: [PATCH] Stop building "opcache" (it's already pre-built in the "php" images) --- Dockerfile-alpine.template | 5 +++-- Dockerfile-debian.template | 5 +++-- php7.2/apache/Dockerfile | 5 +++-- php7.2/fpm-alpine/Dockerfile | 5 +++-- php7.2/fpm/Dockerfile | 5 +++-- php7.3/apache/Dockerfile | 5 +++-- php7.3/fpm-alpine/Dockerfile | 5 +++-- php7.3/fpm/Dockerfile | 5 +++-- php7.4/apache/Dockerfile | 5 +++-- php7.4/fpm-alpine/Dockerfile | 5 +++-- php7.4/fpm/Dockerfile | 5 +++-- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 22b20fe8b4..f5f252b454 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -46,7 +45,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3e9562dcc1..93940d00b2 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -51,7 +50,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile index 4d93b880b2..a567ff7f92 100644 --- a/php7.2/apache/Dockerfile +++ b/php7.2/apache/Dockerfile @@ -28,7 +28,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -50,7 +49,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index 66ca33bfe5..7b4e3c0718 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/php7.2/fpm-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -45,7 +44,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile index 9469cc4252..02d4c33963 100644 --- a/php7.2/fpm/Dockerfile +++ b/php7.2/fpm/Dockerfile @@ -28,7 +28,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -50,7 +49,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index 3aeb115a0d..231a9c023e 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -51,7 +50,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index 1aaa08021c..a6c3be8937 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -46,7 +45,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index d99c68638d..8a8abde62e 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -51,7 +50,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile index 5685ebd23a..6df4770af8 100644 --- a/php7.4/apache/Dockerfile +++ b/php7.4/apache/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -51,7 +50,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile index 1f892e94dc..3284323122 100644 --- a/php7.4/fpm-alpine/Dockerfile +++ b/php7.4/fpm-alpine/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -46,7 +45,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \ diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile index da848419f5..47ebe8ebad 100644 --- a/php7.4/fpm/Dockerfile +++ b/php7.4/fpm/Dockerfile @@ -29,7 +29,6 @@ RUN set -ex; \ exif \ gd \ mysqli \ - opcache \ zip \ ; \ pecl install imagick-3.4.4; \ @@ -51,7 +50,9 @@ RUN set -ex; \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ +RUN set -eux; \ + docker-php-ext-enable opcache; \ + { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.interned_strings_buffer=8'; \ echo 'opcache.max_accelerated_files=4000'; \