Skip to content

Commit 68c8c47

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#511 from infosiftr/opcache
Stop building "opcache" (it's already pre-built in the "php" images)
2 parents 5a7623d + def14e3 commit 68c8c47

File tree

11 files changed

+33
-22
lines changed

11 files changed

+33
-22
lines changed

‎Dockerfile-alpine.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -46,7 +45,9 @@ RUN set -ex; \
4645

4746
# set recommended PHP.ini settings
4847
# see https://secure.php.net/manual/en/opcache.installation.php
49-
RUN { \
48+
RUN set -eux; \
49+
docker-php-ext-enable opcache; \
50+
{ \
5051
echo 'opcache.memory_consumption=128'; \
5152
echo 'opcache.interned_strings_buffer=8'; \
5253
echo 'opcache.max_accelerated_files=4000'; \

‎Dockerfile-debian.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -51,7 +50,9 @@ RUN set -ex; \
5150

5251
# set recommended PHP.ini settings
5352
# see https://secure.php.net/manual/en/opcache.installation.php
54-
RUN { \
53+
RUN set -eux; \
54+
docker-php-ext-enable opcache; \
55+
{ \
5556
echo 'opcache.memory_consumption=128'; \
5657
echo 'opcache.interned_strings_buffer=8'; \
5758
echo 'opcache.max_accelerated_files=4000'; \

‎php7.2/apache/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN set -ex; \
2828
exif \
2929
gd \
3030
mysqli \
31-
opcache \
3231
zip \
3332
; \
3433
pecl install imagick-3.4.4; \
@@ -50,7 +49,9 @@ RUN set -ex; \
5049

5150
# set recommended PHP.ini settings
5251
# see https://secure.php.net/manual/en/opcache.installation.php
53-
RUN { \
52+
RUN set -eux; \
53+
docker-php-ext-enable opcache; \
54+
{ \
5455
echo 'opcache.memory_consumption=128'; \
5556
echo 'opcache.interned_strings_buffer=8'; \
5657
echo 'opcache.max_accelerated_files=4000'; \

‎php7.2/fpm-alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN set -ex; \
2828
exif \
2929
gd \
3030
mysqli \
31-
opcache \
3231
zip \
3332
; \
3433
pecl install imagick-3.4.4; \
@@ -45,7 +44,9 @@ RUN set -ex; \
4544

4645
# set recommended PHP.ini settings
4746
# see https://secure.php.net/manual/en/opcache.installation.php
48-
RUN { \
47+
RUN set -eux; \
48+
docker-php-ext-enable opcache; \
49+
{ \
4950
echo 'opcache.memory_consumption=128'; \
5051
echo 'opcache.interned_strings_buffer=8'; \
5152
echo 'opcache.max_accelerated_files=4000'; \

‎php7.2/fpm/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN set -ex; \
2828
exif \
2929
gd \
3030
mysqli \
31-
opcache \
3231
zip \
3332
; \
3433
pecl install imagick-3.4.4; \
@@ -50,7 +49,9 @@ RUN set -ex; \
5049

5150
# set recommended PHP.ini settings
5251
# see https://secure.php.net/manual/en/opcache.installation.php
53-
RUN { \
52+
RUN set -eux; \
53+
docker-php-ext-enable opcache; \
54+
{ \
5455
echo 'opcache.memory_consumption=128'; \
5556
echo 'opcache.interned_strings_buffer=8'; \
5657
echo 'opcache.max_accelerated_files=4000'; \

‎php7.3/apache/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -51,7 +50,9 @@ RUN set -ex; \
5150

5251
# set recommended PHP.ini settings
5352
# see https://secure.php.net/manual/en/opcache.installation.php
54-
RUN { \
53+
RUN set -eux; \
54+
docker-php-ext-enable opcache; \
55+
{ \
5556
echo 'opcache.memory_consumption=128'; \
5657
echo 'opcache.interned_strings_buffer=8'; \
5758
echo 'opcache.max_accelerated_files=4000'; \

‎php7.3/fpm-alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -46,7 +45,9 @@ RUN set -ex; \
4645

4746
# set recommended PHP.ini settings
4847
# see https://secure.php.net/manual/en/opcache.installation.php
49-
RUN { \
48+
RUN set -eux; \
49+
docker-php-ext-enable opcache; \
50+
{ \
5051
echo 'opcache.memory_consumption=128'; \
5152
echo 'opcache.interned_strings_buffer=8'; \
5253
echo 'opcache.max_accelerated_files=4000'; \

‎php7.3/fpm/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -51,7 +50,9 @@ RUN set -ex; \
5150

5251
# set recommended PHP.ini settings
5352
# see https://secure.php.net/manual/en/opcache.installation.php
54-
RUN { \
53+
RUN set -eux; \
54+
docker-php-ext-enable opcache; \
55+
{ \
5556
echo 'opcache.memory_consumption=128'; \
5657
echo 'opcache.interned_strings_buffer=8'; \
5758
echo 'opcache.max_accelerated_files=4000'; \

‎php7.4/apache/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -51,7 +50,9 @@ RUN set -ex; \
5150

5251
# set recommended PHP.ini settings
5352
# see https://secure.php.net/manual/en/opcache.installation.php
54-
RUN { \
53+
RUN set -eux; \
54+
docker-php-ext-enable opcache; \
55+
{ \
5556
echo 'opcache.memory_consumption=128'; \
5657
echo 'opcache.interned_strings_buffer=8'; \
5758
echo 'opcache.max_accelerated_files=4000'; \

‎php7.4/fpm-alpine/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -46,7 +45,9 @@ RUN set -ex; \
4645

4746
# set recommended PHP.ini settings
4847
# see https://secure.php.net/manual/en/opcache.installation.php
49-
RUN { \
48+
RUN set -eux; \
49+
docker-php-ext-enable opcache; \
50+
{ \
5051
echo 'opcache.memory_consumption=128'; \
5152
echo 'opcache.interned_strings_buffer=8'; \
5253
echo 'opcache.max_accelerated_files=4000'; \

‎php7.4/fpm/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN set -ex; \
2929
exif \
3030
gd \
3131
mysqli \
32-
opcache \
3332
zip \
3433
; \
3534
pecl install imagick-3.4.4; \
@@ -51,7 +50,9 @@ RUN set -ex; \
5150

5251
# set recommended PHP.ini settings
5352
# see https://secure.php.net/manual/en/opcache.installation.php
54-
RUN { \
53+
RUN set -eux; \
54+
docker-php-ext-enable opcache; \
55+
{ \
5556
echo 'opcache.memory_consumption=128'; \
5657
echo 'opcache.interned_strings_buffer=8'; \
5758
echo 'opcache.max_accelerated_files=4000'; \

0 commit comments

Comments
 (0)