php: add PHP_INI_DIR env variable

glensc · glensc · commit 836b2eecf10f · 2019-05-28T13:19:08.000+03:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \
