v2.1.11 (#37)

Minor updates
* Using latest base images
* Allowing 'custom' php.ini value

Documentation updates
* Updating comments in Dockerfiles

Author: bfren

5.6/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.4x-2.1.9
+FROM bfren/apache:apache2.4.4x-2.1.10
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
@@ -10,7 +10,8 @@ ENV \
     PHP_DIR=/etc/php5 \
     # www.conf override: log_level
     PHP_FPM_LOG_LEVEL="notice" \
-    # php.ini template to use
+    # php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
+    # which will cause the other PHP_INI_* environment variables to be ignored
     PHP_INI="production" \
     # php.ini override: display_errors
     PHP_INI_DISPLAY_ERRORS= \

7.4/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.9
+FROM bfren/apache:apache2.4.5x-2.1.10
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
@@ -10,7 +10,8 @@ ENV \
     PHP_DIR=/etc/php7 \
     # www.conf override: log_level
     PHP_FPM_LOG_LEVEL="notice" \
-    # php.ini template to use
+    # php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
+    # which will cause the other PHP_INI_* environment variables to be ignored
     PHP_INI="production" \
     # php.ini override: display_errors
     PHP_INI_DISPLAY_ERRORS= \

8.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.9
+FROM bfren/apache:apache2.4.5x-2.1.10
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
@@ -10,7 +10,8 @@ ENV \
     PHP_DIR=/etc/php8 \
     # www.conf override: log_level
     PHP_FPM_LOG_LEVEL="notice" \
-    # php.ini template to use
+    # php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
+    # which will cause the other PHP_INI_* environment variables to be ignored
     PHP_INI="production" \
     # php.ini override: display_errors
     PHP_INI_DISPLAY_ERRORS= \

Dockerfile.esh

@@ -10,7 +10,8 @@ ENV \
     PHP_DIR=/etc/php<%= ${PHP_MAJOR} %> \
     # www.conf override: log_level
     PHP_FPM_LOG_LEVEL="notice" \
-    # php.ini template to use
+    # php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
+    # which will cause the other PHP_INI_* environment variables to be ignored
     PHP_INI="production" \
     # php.ini override: display_errors
     PHP_INI_DISPLAY_ERRORS= \

VERSION

@@ -1 +1 @@
-2.1.10
+2.1.11

generate-dockerfiles.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="2.1.9"
+BASE_REVISION="2.1.10"
 echo "Base: ${BASE_REVISION}"
 
 PHP_VERSIONS="5.6 7.4 8.0"

overlay/etc/bf/init.d/21-php-ini-download

@@ -21,6 +21,11 @@ if [ "${PHP_INI}" = "development" ] || [ "${PHP_INI}" = "production" ] ; then
         && touch ${DOWNLOADED}
     exit 0
 
+elif [ "${PHP_INI}" = "custom" ] ; then
+
+    bf-echo "Custom PHP configuration enabled."
+    exit 0
+
 fi
 
 bf-error "Unsupported PHP_INI value '${PHP_INI}'."

overlay/etc/bf/init.d/22-php-ini-config

@@ -8,17 +8,21 @@ export BF_E=`basename ${0}`
 # Optionally override configuration.
 #======================================================================================================================
 
-bf-echo "Setting php.ini configuration values..."
-
-declare -A VALUES
-VALUES["display_errors"]="${PHP_INI_DISPLAY_ERRORS-}"
-VALUES["display_startup_errors"]="${PHP_INI_DISPLAY_STARTUP_ERRORS-}"
-VALUES["error_log"]="${PHP_INI_ERROR_LOG-}"
-VALUES["error_reporting"]="${PHP_INI_ERROR_REPORTING-}"
-VALUES["memory_limit"]="${PHP_INI_MEMORY_LIMIT-}"
-VALUES["post_max_size"]="${PHP_INI_MAX_POST-}"
-VALUES["session.gc_maxlifetime"]="${PHP_SESSION_MAX_LIFETIME-}"
-VALUES["upload_max_filesize"]="${PHP_INI_MAX_UPLOAD-}"
-
-source ${BF_INC}/php-replace-ini.sh
-replace-ini VALUES ${PHP_DIR}/php.ini
+if [ "${PHP_INI}" != "custom" ] ; then
+
+    bf-echo "Setting php.ini configuration values..."
+
+    declare -A VALUES
+    VALUES["display_errors"]="${PHP_INI_DISPLAY_ERRORS-}"
+    VALUES["display_startup_errors"]="${PHP_INI_DISPLAY_STARTUP_ERRORS-}"
+    VALUES["error_log"]="${PHP_INI_ERROR_LOG-}"
+    VALUES["error_reporting"]="${PHP_INI_ERROR_REPORTING-}"
+    VALUES["memory_limit"]="${PHP_INI_MEMORY_LIMIT-}"
+    VALUES["post_max_size"]="${PHP_INI_MAX_POST-}"
+    VALUES["session.gc_maxlifetime"]="${PHP_SESSION_MAX_LIFETIME-}"
+    VALUES["upload_max_filesize"]="${PHP_INI_MAX_UPLOAD-}"
+
+    source ${BF_INC}/php-replace-ini.sh
+    replace-ini VALUES ${PHP_DIR}/php.ini
+
+fi