From 836b2eecf10f19c2090173826298b81f76d92d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 26 May 2019 03:53:18 +0300
Subject: [PATCH 1/3] php: add PHP_INI_DIR env variable

---
 docker/7.0-apache.Dockerfile    | 3 +++
 docker/7.0-cgi.Dockerfile       | 3 +++
 docker/7.0-cli.Dockerfile       | 3 +++
 docker/7.0-lighttpd.Dockerfile  | 3 +++
 docker/7.0-litespeed.Dockerfile | 3 +++
 docker/7.0-nginx.Dockerfile     | 3 +++
 docker/7.0.Dockerfile           | 3 +++
 docker/7.1-apache.Dockerfile    | 3 +++
 docker/7.1-cgi.Dockerfile       | 3 +++
 docker/7.1-cli.Dockerfile       | 3 +++
 docker/7.1-lighttpd.Dockerfile  | 3 +++
 docker/7.1-litespeed.Dockerfile | 3 +++
 docker/7.1-nginx.Dockerfile     | 3 +++
 docker/7.1.Dockerfile           | 3 +++
 docker/7.2-apache.Dockerfile    | 3 +++
 docker/7.2-cgi.Dockerfile       | 3 +++
 docker/7.2-cli.Dockerfile       | 3 +++
 docker/7.2-lighttpd.Dockerfile  | 3 +++
 docker/7.2-litespeed.Dockerfile | 3 +++
 docker/7.2-nginx.Dockerfile     | 3 +++
 docker/7.2.Dockerfile           | 3 +++
 docker/7.3-apache.Dockerfile    | 3 +++
 docker/7.3-cgi.Dockerfile       | 3 +++
 docker/7.3-cli.Dockerfile       | 3 +++
 docker/7.3-lighttpd.Dockerfile  | 3 +++
 docker/7.3-litespeed.Dockerfile | 3 +++
 docker/7.3-nginx.Dockerfile     | 3 +++
 docker/7.3.Dockerfile           | 3 +++
 docker/7.4-apache.Dockerfile    | 3 +++
 docker/7.4-cgi.Dockerfile       | 3 +++
 docker/7.4-cli.Dockerfile       | 3 +++
 docker/7.4-lighttpd.Dockerfile  | 3 +++
 docker/7.4-litespeed.Dockerfile | 3 +++
 docker/7.4-nginx.Dockerfile     | 3 +++
 docker/7.4.Dockerfile           | 3 +++
 35 files changed, 105 insertions(+)

diff --git a/docker/7.0-apache.Dockerfile b/docker/7.0-apache.Dockerfile
index 6cb5d76..87137ef 100644
--- a/docker/7.0-apache.Dockerfile
+++ b/docker/7.0-apache.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.0, Apache, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0-cgi.Dockerfile b/docker/7.0-cgi.Dockerfile
index bea87a9..eb643cd 100644
--- a/docker/7.0-cgi.Dockerfile
+++ b/docker/7.0-cgi.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CGI 7.0, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0-cli.Dockerfile b/docker/7.0-cli.Dockerfile
index 3cafaee..e6b4981 100644
--- a/docker/7.0-cli.Dockerfile
+++ b/docker/7.0-cli.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.0, additional PHP extensions, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0-lighttpd.Dockerfile b/docker/7.0-lighttpd.Dockerfile
index a85c022..66a2c21 100644
--- a/docker/7.0-lighttpd.Dockerfile
+++ b/docker/7.0-lighttpd.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.0, Lighttpd, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0-litespeed.Dockerfile b/docker/7.0-litespeed.Dockerfile
index 4ca939f..2441446 100644
--- a/docker/7.0-litespeed.Dockerfile
+++ b/docker/7.0-litespeed.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.0, OpenLiteSpeed, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0-nginx.Dockerfile b/docker/7.0-nginx.Dockerfile
index aef059f..510c63a 100644
--- a/docker/7.0-nginx.Dockerfile
+++ b/docker/7.0-nginx.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.0, Nginx, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.0.Dockerfile b/docker/7.0.Dockerfile
index 3920e2c..66cef0c 100644
--- a/docker/7.0.Dockerfile
+++ b/docker/7.0.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.0, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-apache.Dockerfile b/docker/7.1-apache.Dockerfile
index 6122c48..dc9ad6d 100644
--- a/docker/7.1-apache.Dockerfile
+++ b/docker/7.1-apache.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.1, Apache, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-cgi.Dockerfile b/docker/7.1-cgi.Dockerfile
index a419af1..07fccbb 100644
--- a/docker/7.1-cgi.Dockerfile
+++ b/docker/7.1-cgi.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CGI 7.1, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-cli.Dockerfile b/docker/7.1-cli.Dockerfile
index 0bb743a..158c296 100644
--- a/docker/7.1-cli.Dockerfile
+++ b/docker/7.1-cli.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.1, additional PHP extensions, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-lighttpd.Dockerfile b/docker/7.1-lighttpd.Dockerfile
index c140be9..cbd4a66 100644
--- a/docker/7.1-lighttpd.Dockerfile
+++ b/docker/7.1-lighttpd.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.1, Lighttpd, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-litespeed.Dockerfile b/docker/7.1-litespeed.Dockerfile
index b68c396..0efcaa4 100644
--- a/docker/7.1-litespeed.Dockerfile
+++ b/docker/7.1-litespeed.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.1, OpenLiteSpeed, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1-nginx.Dockerfile b/docker/7.1-nginx.Dockerfile
index 4381996..c50792f 100644
--- a/docker/7.1-nginx.Dockerfile
+++ b/docker/7.1-nginx.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.1, Nginx, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.1.Dockerfile b/docker/7.1.Dockerfile
index 25c52a9..e974ff9 100644
--- a/docker/7.1.Dockerfile
+++ b/docker/7.1.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.1, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.1
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-apache.Dockerfile b/docker/7.2-apache.Dockerfile
index cfc2628..5aa2d6e 100644
--- a/docker/7.2-apache.Dockerfile
+++ b/docker/7.2-apache.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.2, Apache, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-cgi.Dockerfile b/docker/7.2-cgi.Dockerfile
index c24f4ab..bf7120f 100644
--- a/docker/7.2-cgi.Dockerfile
+++ b/docker/7.2-cgi.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CGI 7.2, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-cli.Dockerfile b/docker/7.2-cli.Dockerfile
index 4b799e0..720a4a9 100644
--- a/docker/7.2-cli.Dockerfile
+++ b/docker/7.2-cli.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.2, additional PHP extensions, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-lighttpd.Dockerfile b/docker/7.2-lighttpd.Dockerfile
index 78990f8..44aaa6b 100644
--- a/docker/7.2-lighttpd.Dockerfile
+++ b/docker/7.2-lighttpd.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.2, Lighttpd, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-litespeed.Dockerfile b/docker/7.2-litespeed.Dockerfile
index ef08c5a..6b30bbe 100644
--- a/docker/7.2-litespeed.Dockerfile
+++ b/docker/7.2-litespeed.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.2, OpenLiteSpeed, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2-nginx.Dockerfile b/docker/7.2-nginx.Dockerfile
index a7ffe4c..c328585 100644
--- a/docker/7.2-nginx.Dockerfile
+++ b/docker/7.2-nginx.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.2, Nginx, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.2.Dockerfile b/docker/7.2.Dockerfile
index d8fff79..1b19573 100644
--- a/docker/7.2.Dockerfile
+++ b/docker/7.2.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.2, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.2
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-apache.Dockerfile b/docker/7.3-apache.Dockerfile
index 4a3f291..bc4f1d4 100644
--- a/docker/7.3-apache.Dockerfile
+++ b/docker/7.3-apache.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.3, Apache, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-cgi.Dockerfile b/docker/7.3-cgi.Dockerfile
index c188270..6c9db33 100644
--- a/docker/7.3-cgi.Dockerfile
+++ b/docker/7.3-cgi.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CGI 7.3, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-cli.Dockerfile b/docker/7.3-cli.Dockerfile
index 8bc92f3..c51dbf1 100644
--- a/docker/7.3-cli.Dockerfile
+++ b/docker/7.3-cli.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.3, additional PHP extensions, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-lighttpd.Dockerfile b/docker/7.3-lighttpd.Dockerfile
index db0448c..01b69b0 100644
--- a/docker/7.3-lighttpd.Dockerfile
+++ b/docker/7.3-lighttpd.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.3, Lighttpd, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-litespeed.Dockerfile b/docker/7.3-litespeed.Dockerfile
index 3496946..30e7641 100644
--- a/docker/7.3-litespeed.Dockerfile
+++ b/docker/7.3-litespeed.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.3, OpenLiteSpeed, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3-nginx.Dockerfile b/docker/7.3-nginx.Dockerfile
index f71b31c..6aea3d5 100644
--- a/docker/7.3-nginx.Dockerfile
+++ b/docker/7.3-nginx.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.3, Nginx, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.3.Dockerfile b/docker/7.3.Dockerfile
index 2063e0f..736cef3 100644
--- a/docker/7.3.Dockerfile
+++ b/docker/7.3.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.3, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.3
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-apache.Dockerfile b/docker/7.4-apache.Dockerfile
index 7ae40a5..d9a6ccd 100644
--- a/docker/7.4-apache.Dockerfile
+++ b/docker/7.4-apache.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.4, Apache, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-cgi.Dockerfile b/docker/7.4-cgi.Dockerfile
index 852144e..deb72e9 100644
--- a/docker/7.4-cgi.Dockerfile
+++ b/docker/7.4-cgi.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CGI 7.4, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-cli.Dockerfile b/docker/7.4-cli.Dockerfile
index edcde17..0ca6867 100644
--- a/docker/7.4-cli.Dockerfile
+++ b/docker/7.4-cli.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.4, additional PHP extensions, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-lighttpd.Dockerfile b/docker/7.4-lighttpd.Dockerfile
index e9fed12..67ed4c2 100644
--- a/docker/7.4-lighttpd.Dockerfile
+++ b/docker/7.4-lighttpd.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.4, Lighttpd, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-litespeed.Dockerfile b/docker/7.4-litespeed.Dockerfile
index 18daeb2..77b3bd0 100644
--- a/docker/7.4-litespeed.Dockerfile
+++ b/docker/7.4-litespeed.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.4, OpenLiteSpeed, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4-nginx.Dockerfile b/docker/7.4-nginx.Dockerfile
index f693d9e..b7c1400 100644
--- a/docker/7.4-nginx.Dockerfile
+++ b/docker/7.4-nginx.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP 7.4, Nginx, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \
diff --git a/docker/7.4.Dockerfile b/docker/7.4.Dockerfile
index 8fec522..0b3a8a0 100644
--- a/docker/7.4.Dockerfile
+++ b/docker/7.4.Dockerfile
@@ -12,6 +12,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.description="Docker For PHP Developers - Docker image with PHP CLI 7.4, and Alpine" \
       org.label-schema.url="https://github.com/phpearth/docker-php"
 
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.4
+
 ENV \
     # When using Composer, disable the warning about running commands as root/super user
     COMPOSER_ALLOW_SUPERUSER=1 \

From 9f8ba39b8c7240565878fe13df48d79f98ea9e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Tue, 28 May 2019 13:19:43 +0300
Subject: [PATCH 2/3] move $DEPS out of runtime ENV

---
 docker/7.0-apache.Dockerfile    | 14 ++++++++------
 docker/7.0-cgi.Dockerfile       | 14 ++++++++------
 docker/7.0-cli.Dockerfile       | 14 ++++++++------
 docker/7.0-lighttpd.Dockerfile  | 14 ++++++++------
 docker/7.0-litespeed.Dockerfile | 14 ++++++++------
 docker/7.0-nginx.Dockerfile     | 14 ++++++++------
 docker/7.0.Dockerfile           | 14 ++++++++------
 docker/7.1-apache.Dockerfile    | 14 ++++++++------
 docker/7.1-cgi.Dockerfile       | 14 ++++++++------
 docker/7.1-cli.Dockerfile       | 14 ++++++++------
 docker/7.1-lighttpd.Dockerfile  | 14 ++++++++------
 docker/7.1-litespeed.Dockerfile | 14 ++++++++------
 docker/7.1-nginx.Dockerfile     | 14 ++++++++------
 docker/7.1.Dockerfile           | 14 ++++++++------
 docker/7.2-apache.Dockerfile    | 14 ++++++++------
 docker/7.2-cgi.Dockerfile       | 14 ++++++++------
 docker/7.2-cli.Dockerfile       | 14 ++++++++------
 docker/7.2-lighttpd.Dockerfile  | 14 ++++++++------
 docker/7.2-litespeed.Dockerfile | 14 ++++++++------
 docker/7.2-nginx.Dockerfile     | 14 ++++++++------
 docker/7.2.Dockerfile           | 14 ++++++++------
 docker/7.3-apache.Dockerfile    | 14 ++++++++------
 docker/7.3-cgi.Dockerfile       | 14 ++++++++------
 docker/7.3-cli.Dockerfile       | 14 ++++++++------
 docker/7.3-lighttpd.Dockerfile  | 14 ++++++++------
 docker/7.3-litespeed.Dockerfile | 14 ++++++++------
 docker/7.3-nginx.Dockerfile     | 14 ++++++++------
 docker/7.3.Dockerfile           | 14 ++++++++------
 docker/7.4-apache.Dockerfile    | 14 ++++++++------
 docker/7.4-cgi.Dockerfile       | 14 ++++++++------
 docker/7.4-cli.Dockerfile       | 14 ++++++++------
 docker/7.4-lighttpd.Dockerfile  | 14 ++++++++------
 docker/7.4-litespeed.Dockerfile | 14 ++++++++------
 docker/7.4-nginx.Dockerfile     | 14 ++++++++------
 docker/7.4.Dockerfile           | 14 ++++++++------
 35 files changed, 280 insertions(+), 210 deletions(-)

diff --git a/docker/7.0-apache.Dockerfile b/docker/7.0-apache.Dockerfile
index 87137ef..601b7bf 100644
--- a/docker/7.0-apache.Dockerfile
+++ b/docker/7.0-apache.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.0 \
         php7.0-phar \
         php7.0-bcmath \
         php7.0-calendar \
@@ -53,7 +54,8 @@ ENV \
         curl \
         ca-certificates \
         runit \
-        apache2"
+        apache2 \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0-cgi.Dockerfile b/docker/7.0-cgi.Dockerfile
index eb643cd..dbfd8a6 100644
--- a/docker/7.0-cgi.Dockerfile
+++ b/docker/7.0-cgi.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.0 \
         php7.0-phar \
         php7.0-bcmath \
         php7.0-calendar \
@@ -52,7 +53,8 @@ ENV \
         php7.0-cgi \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0-cli.Dockerfile b/docker/7.0-cli.Dockerfile
index e6b4981..aa2dde6 100644
--- a/docker/7.0-cli.Dockerfile
+++ b/docker/7.0-cli.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.0 \
         php7.0-phar \
         php7.0-bcmath \
         php7.0-calendar \
@@ -50,7 +51,8 @@ ENV \
         php7.0-json \
         php7.0-posix \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0-lighttpd.Dockerfile b/docker/7.0-lighttpd.Dockerfile
index 66a2c21..a6a5a56 100644
--- a/docker/7.0-lighttpd.Dockerfile
+++ b/docker/7.0-lighttpd.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        lighttpd \
         php7.0 \
         php7.0-phar \
         php7.0-bcmath \
@@ -53,7 +54,8 @@ ENV \
         php7.0-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0-litespeed.Dockerfile b/docker/7.0-litespeed.Dockerfile
index 2441446..0f8ba54 100644
--- a/docker/7.0-litespeed.Dockerfile
+++ b/docker/7.0-litespeed.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        curl \
         ca-certificates \
         runit \
         php7.0 \
@@ -53,7 +54,8 @@ ENV \
         php7.0-json \
         php7.0-posix \
         php7.0-litespeed \
-        litespeed"
+        litespeed \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0-nginx.Dockerfile b/docker/7.0-nginx.Dockerfile
index 510c63a..eb219a3 100644
--- a/docker/7.0-nginx.Dockerfile
+++ b/docker/7.0-nginx.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        nginx \
         nginx-mod-http-headers-more \
         php7.0 \
         php7.0-phar \
@@ -54,7 +55,8 @@ ENV \
         php7.0-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.0.Dockerfile b/docker/7.0.Dockerfile
index 66cef0c..f5ab0fc 100644
--- a/docker/7.0.Dockerfile
+++ b/docker/7.0.Dockerfile
@@ -15,13 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.0
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.0 \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-apache.Dockerfile b/docker/7.1-apache.Dockerfile
index dc9ad6d..8ec0835 100644
--- a/docker/7.1-apache.Dockerfile
+++ b/docker/7.1-apache.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.1 \
         php7.1-phar \
         php7.1-bcmath \
         php7.1-calendar \
@@ -53,7 +54,8 @@ ENV \
         curl \
         ca-certificates \
         runit \
-        apache2"
+        apache2 \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-cgi.Dockerfile b/docker/7.1-cgi.Dockerfile
index 07fccbb..47baeda 100644
--- a/docker/7.1-cgi.Dockerfile
+++ b/docker/7.1-cgi.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.1 \
         php7.1-phar \
         php7.1-bcmath \
         php7.1-calendar \
@@ -52,7 +53,8 @@ ENV \
         php7.1-cgi \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-cli.Dockerfile b/docker/7.1-cli.Dockerfile
index 158c296..eeef5aa 100644
--- a/docker/7.1-cli.Dockerfile
+++ b/docker/7.1-cli.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.1 \
         php7.1-phar \
         php7.1-bcmath \
         php7.1-calendar \
@@ -50,7 +51,8 @@ ENV \
         php7.1-json \
         php7.1-posix \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-lighttpd.Dockerfile b/docker/7.1-lighttpd.Dockerfile
index cbd4a66..d574adc 100644
--- a/docker/7.1-lighttpd.Dockerfile
+++ b/docker/7.1-lighttpd.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        lighttpd \
         php7.1 \
         php7.1-phar \
         php7.1-bcmath \
@@ -53,7 +54,8 @@ ENV \
         php7.1-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-litespeed.Dockerfile b/docker/7.1-litespeed.Dockerfile
index 0efcaa4..4cdcb9d 100644
--- a/docker/7.1-litespeed.Dockerfile
+++ b/docker/7.1-litespeed.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        curl \
         ca-certificates \
         runit \
         php7.1 \
@@ -53,7 +54,8 @@ ENV \
         php7.1-json \
         php7.1-posix \
         php7.1-litespeed \
-        litespeed"
+        litespeed \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1-nginx.Dockerfile b/docker/7.1-nginx.Dockerfile
index c50792f..e60cc92 100644
--- a/docker/7.1-nginx.Dockerfile
+++ b/docker/7.1-nginx.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        nginx \
         nginx-mod-http-headers-more \
         php7.1 \
         php7.1-phar \
@@ -54,7 +55,8 @@ ENV \
         php7.1-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.1.Dockerfile b/docker/7.1.Dockerfile
index e974ff9..aa2687a 100644
--- a/docker/7.1.Dockerfile
+++ b/docker/7.1.Dockerfile
@@ -15,13 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.1
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.1 \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-apache.Dockerfile b/docker/7.2-apache.Dockerfile
index 5aa2d6e..07de2e7 100644
--- a/docker/7.2-apache.Dockerfile
+++ b/docker/7.2-apache.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.2 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.2 \
         php7.2-phar \
         php7.2-bcmath \
         php7.2-calendar \
@@ -53,7 +54,8 @@ ENV \
         curl \
         ca-certificates \
         runit \
-        apache2"
+        apache2 \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-cgi.Dockerfile b/docker/7.2-cgi.Dockerfile
index bf7120f..5f5187d 100644
--- a/docker/7.2-cgi.Dockerfile
+++ b/docker/7.2-cgi.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.2 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.2 \
         php7.2-phar \
         php7.2-bcmath \
         php7.2-calendar \
@@ -52,7 +53,8 @@ ENV \
         php7.2-cgi \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-cli.Dockerfile b/docker/7.2-cli.Dockerfile
index 720a4a9..65037d6 100644
--- a/docker/7.2-cli.Dockerfile
+++ b/docker/7.2-cli.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.2 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.2 \
         php7.2-phar \
         php7.2-bcmath \
         php7.2-calendar \
@@ -50,7 +51,8 @@ ENV \
         php7.2-json \
         php7.2-posix \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-lighttpd.Dockerfile b/docker/7.2-lighttpd.Dockerfile
index 44aaa6b..f459480 100644
--- a/docker/7.2-lighttpd.Dockerfile
+++ b/docker/7.2-lighttpd.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        lighttpd \
         php7.2 \
         php7.2-phar \
         php7.2-bcmath \
@@ -53,7 +54,8 @@ ENV \
         php7.2-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-litespeed.Dockerfile b/docker/7.2-litespeed.Dockerfile
index 6b30bbe..ea5ff47 100644
--- a/docker/7.2-litespeed.Dockerfile
+++ b/docker/7.2-litespeed.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        curl \
         ca-certificates \
         runit \
         php7.2 \
@@ -53,7 +54,8 @@ ENV \
         php7.2-json \
         php7.2-posix \
         php7.2-litespeed \
-        litespeed"
+        litespeed \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2-nginx.Dockerfile b/docker/7.2-nginx.Dockerfile
index c328585..14a5e77 100644
--- a/docker/7.2-nginx.Dockerfile
+++ b/docker/7.2-nginx.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        nginx \
         nginx-mod-http-headers-more \
         php7.2 \
         php7.2-phar \
@@ -54,7 +55,8 @@ ENV \
         php7.2-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.2.Dockerfile b/docker/7.2.Dockerfile
index 1b19573..4727810 100644
--- a/docker/7.2.Dockerfile
+++ b/docker/7.2.Dockerfile
@@ -15,13 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.2
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.2 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.2 \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-apache.Dockerfile b/docker/7.3-apache.Dockerfile
index bc4f1d4..70253b2 100644
--- a/docker/7.3-apache.Dockerfile
+++ b/docker/7.3-apache.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.3 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.3 \
         php7.3-phar \
         php7.3-bcmath \
         php7.3-calendar \
@@ -53,7 +54,8 @@ ENV \
         curl \
         ca-certificates \
         runit \
-        apache2"
+        apache2 \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-cgi.Dockerfile b/docker/7.3-cgi.Dockerfile
index 6c9db33..38b64a1 100644
--- a/docker/7.3-cgi.Dockerfile
+++ b/docker/7.3-cgi.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.3 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.3 \
         php7.3-phar \
         php7.3-bcmath \
         php7.3-calendar \
@@ -52,7 +53,8 @@ ENV \
         php7.3-cgi \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-cli.Dockerfile b/docker/7.3-cli.Dockerfile
index c51dbf1..23eff6a 100644
--- a/docker/7.3-cli.Dockerfile
+++ b/docker/7.3-cli.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.3 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.3 \
         php7.3-phar \
         php7.3-bcmath \
         php7.3-calendar \
@@ -50,7 +51,8 @@ ENV \
         php7.3-json \
         php7.3-posix \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-lighttpd.Dockerfile b/docker/7.3-lighttpd.Dockerfile
index 01b69b0..16bacc0 100644
--- a/docker/7.3-lighttpd.Dockerfile
+++ b/docker/7.3-lighttpd.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        lighttpd \
         php7.3 \
         php7.3-phar \
         php7.3-bcmath \
@@ -53,7 +54,8 @@ ENV \
         php7.3-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-litespeed.Dockerfile b/docker/7.3-litespeed.Dockerfile
index 30e7641..17876ac 100644
--- a/docker/7.3-litespeed.Dockerfile
+++ b/docker/7.3-litespeed.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        curl \
         ca-certificates \
         runit \
         php7.3 \
@@ -53,7 +54,8 @@ ENV \
         php7.3-json \
         php7.3-posix \
         php7.3-litespeed \
-        litespeed"
+        litespeed \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3-nginx.Dockerfile b/docker/7.3-nginx.Dockerfile
index 6aea3d5..ae41876 100644
--- a/docker/7.3-nginx.Dockerfile
+++ b/docker/7.3-nginx.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        nginx \
         nginx-mod-http-headers-more \
         php7.3 \
         php7.3-phar \
@@ -54,7 +55,8 @@ ENV \
         php7.3-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.3.Dockerfile b/docker/7.3.Dockerfile
index 736cef3..d6d1fcd 100644
--- a/docker/7.3.Dockerfile
+++ b/docker/7.3.Dockerfile
@@ -15,13 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.3
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.3 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.3 \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-apache.Dockerfile b/docker/7.4-apache.Dockerfile
index d9a6ccd..249309c 100644
--- a/docker/7.4-apache.Dockerfile
+++ b/docker/7.4-apache.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.4 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.4 \
         php7.4-phar \
         php7.4-bcmath \
         php7.4-calendar \
@@ -53,7 +54,8 @@ ENV \
         curl \
         ca-certificates \
         runit \
-        apache2"
+        apache2 \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-cgi.Dockerfile b/docker/7.4-cgi.Dockerfile
index deb72e9..d1a0e40 100644
--- a/docker/7.4-cgi.Dockerfile
+++ b/docker/7.4-cgi.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.4 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.4 \
         php7.4-phar \
         php7.4-bcmath \
         php7.4-calendar \
@@ -52,7 +53,8 @@ ENV \
         php7.4-cgi \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-cli.Dockerfile b/docker/7.4-cli.Dockerfile
index 0ca6867..171ce82 100644
--- a/docker/7.4-cli.Dockerfile
+++ b/docker/7.4-cli.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.4 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.4 \
         php7.4-phar \
         php7.4-bcmath \
         php7.4-calendar \
@@ -50,7 +51,8 @@ ENV \
         php7.4-json \
         php7.4-posix \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-lighttpd.Dockerfile b/docker/7.4-lighttpd.Dockerfile
index 67ed4c2..6c3a91e 100644
--- a/docker/7.4-lighttpd.Dockerfile
+++ b/docker/7.4-lighttpd.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        lighttpd \
         php7.4 \
         php7.4-phar \
         php7.4-bcmath \
@@ -53,7 +54,8 @@ ENV \
         php7.4-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-litespeed.Dockerfile b/docker/7.4-litespeed.Dockerfile
index 77b3bd0..1995620 100644
--- a/docker/7.4-litespeed.Dockerfile
+++ b/docker/7.4-litespeed.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        curl \
         ca-certificates \
         runit \
         php7.4 \
@@ -53,7 +54,8 @@ ENV \
         php7.4-json \
         php7.4-posix \
         php7.4-litespeed \
-        litespeed"
+        litespeed \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4-nginx.Dockerfile b/docker/7.4-nginx.Dockerfile
index b7c1400..27cc492 100644
--- a/docker/7.4-nginx.Dockerfile
+++ b/docker/7.4-nginx.Dockerfile
@@ -15,11 +15,12 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        nginx \
         nginx-mod-http-headers-more \
         php7.4 \
         php7.4-phar \
@@ -54,7 +55,8 @@ ENV \
         php7.4-fpm \
         curl \
         ca-certificates \
-        runit"
+        runit \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub
diff --git a/docker/7.4.Dockerfile b/docker/7.4.Dockerfile
index 0b3a8a0..7d5df07 100644
--- a/docker/7.4.Dockerfile
+++ b/docker/7.4.Dockerfile
@@ -15,13 +15,15 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
 # PHP_INI_DIR to be symmetrical with official php docker image
 ENV PHP_INI_DIR /etc/php/7.4
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.4 \
+# When using Composer, disable the warning about running commands as root/super user
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+# Persistent runtime dependencies
+ARG DEPS="\
+        php7.4 \
         curl \
-        ca-certificates"
+        ca-certificates \
+"
 
 # PHP.earth Alpine repository for better developer experience
 ADD https://repos.php.earth/alpine/phpearth.rsa.pub /etc/apk/keys/phpearth.rsa.pub

From 9c3858e7b637a97ea3655a2ec72b4e0e04101eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Tue, 28 May 2019 13:30:31 +0300
Subject: [PATCH 3/3] add brief section how to configure php.ini settings

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 406290b..a0a47d7 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,23 @@ apk add --no-cache php7.3-dev gcc g++
 pecl install {extension-name}
 ```
 
+### PHP ini settings
+
+To configure extra [php.ini](https://www.php.net/manual/en/ini.php): settings,
+create application specific `php.ini` and copy the file into docker image:
+
+
+```ini
+# php.ini
+memory_limit = 512M
+```
+
+```Dockerfile
+FROM phpearth/php:7.3-nginx
+
+COPY php.ini $PHP_INI_DIR/conf.d/my-app.ini
+```
+
 #### Missing extension?
 
 In case you'd need an additional extension in the PHP.earth repository, [open an issue](https://github.com/phpearth/docker-php/issues).