Merge pull request #34 from glensc/patch-1

php: add PHP_INI_DIR variable to container

Author: petk

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).

docker/7.0-apache.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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 +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

docker/7.0-cgi.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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 \
@@ -49,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

docker/7.0-cli.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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 \
@@ -47,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

docker/7.0-lighttpd.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="lighttpd \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
+# 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 \
@@ -50,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

docker/7.0-litespeed.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="curl \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
+# 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 \
@@ -50,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

docker/7.0-nginx.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="nginx \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.0
+
+# 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 \
@@ -51,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

docker/7.0.Dockerfile

@@ -12,13 +12,18 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.0 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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

docker/7.1-apache.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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 +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

docker/7.1-cgi.Dockerfile

@@ -12,11 +12,15 @@ 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"
 
-ENV \
-    # When using Composer, disable the warning about running commands as root/super user
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    # Persistent runtime dependencies
-    DEPS="php7.1 \
+# PHP_INI_DIR to be symmetrical with official php docker image
+ENV PHP_INI_DIR /etc/php/7.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 \
@@ -49,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