From 1eede2e6b41268f95059a13fcd2410729a518a28 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 23 Dec 2019 16:25:14 +0100 Subject: [PATCH] Use PHP_INI_DIR from base image Ref: https://hub.docker.com/_/php --- Dockerfile-alpine.template | 6 +++--- Dockerfile-debian.template | 6 +++--- apache/Dockerfile | 6 +++--- fpm-alpine/Dockerfile | 6 +++--- fpm/Dockerfile | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 65c31c5e..470fc979 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -43,18 +43,18 @@ RUN { \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ + } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly = 1'; \ echo 'session.use_strict_mode = 1'; \ - } > /usr/local/etc/php/conf.d/session-strict.ini; \ + } > $PHP_INI_DIR/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen = Off'; \ echo 'max_execution_time = 600'; \ echo 'memory_limit = 512M'; \ - } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini + } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini # Calculate download URL ENV VERSION %%VERSION%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 52df106c..3fc3d1ed 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -46,18 +46,18 @@ RUN { \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ + } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly = 1'; \ echo 'session.use_strict_mode = 1'; \ - } > /usr/local/etc/php/conf.d/session-strict.ini; \ + } > $PHP_INI_DIR/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen = Off'; \ echo 'max_execution_time = 600'; \ echo 'memory_limit = 512M'; \ - } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini + } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini # Calculate download URL ENV VERSION %%VERSION%% diff --git a/apache/Dockerfile b/apache/Dockerfile index ebb8154a..32114c83 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -46,18 +46,18 @@ RUN { \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ + } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly = 1'; \ echo 'session.use_strict_mode = 1'; \ - } > /usr/local/etc/php/conf.d/session-strict.ini; \ + } > $PHP_INI_DIR/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen = Off'; \ echo 'max_execution_time = 600'; \ echo 'memory_limit = 512M'; \ - } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini + } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini # Calculate download URL ENV VERSION 4.9.2 diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index c717b3e5..df650d96 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -43,18 +43,18 @@ RUN { \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ + } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly = 1'; \ echo 'session.use_strict_mode = 1'; \ - } > /usr/local/etc/php/conf.d/session-strict.ini; \ + } > $PHP_INI_DIR/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen = Off'; \ echo 'max_execution_time = 600'; \ echo 'memory_limit = 512M'; \ - } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini + } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini # Calculate download URL ENV VERSION 4.9.2 diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 9a542323..9dbaafaf 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -46,18 +46,18 @@ RUN { \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ + } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly = 1'; \ echo 'session.use_strict_mode = 1'; \ - } > /usr/local/etc/php/conf.d/session-strict.ini; \ + } > $PHP_INI_DIR/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen = Off'; \ echo 'max_execution_time = 600'; \ echo 'memory_limit = 512M'; \ - } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini + } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini # Calculate download URL ENV VERSION 4.9.2