Use conf_env for runtime configuration

Author: hason

rootfs/docker-entrypoint.d/20-fpm.sh

@@ -1,34 +1,9 @@
 #!/bin/sh
 set -e
 
-if [ "$(id -u)" != 0 ] || [ x"${PHP_RUNTIME_CONF-1}" != x'1' ]; then
-    return
+if [ "$(id -u)" != 0 ] || [ "${PHP_RUNTIME_CONF-1}" != '1' ]; then
+  return
 fi
 
-_FPM_CONF="$PHP_INI_DIR/php-fpm.conf"
-_FPM_WWW_CONF="$PHP_INI_DIR/php-fpm.d/www.conf"
-
-for _ENV_NAME in $(printenv | awk -F= '{print $1}'); do
-    if [ "${_ENV_NAME:0:8}" = "FPM_WWW_" ]; then
-        if [ ! -w "$_FPM_WWW_CONF" ]; then
-            continue
-        fi
-        _START=8
-        _FILE="$_FPM_WWW_CONF"
-    elif [ "${_ENV_NAME:0:4}" = "FPM_" ] && [ -w "$_FPM_CONF" ]; then
-        _START=4
-        _FILE="$_FPM_CONF"
-    else
-        continue
-    fi
-
-    _FPM_NAME="$(echo "${_ENV_NAME:$_START}" | sed -e 's|__|\.|g' | tr '[:upper:]' '[:lower:]')"
-    _FPM_VALUE="$(eval echo "\${$_ENV_NAME}")"
-    if grep "${_FPM_NAME} =" "$_FILE" > /dev/null; then
-        sed -i "s|^[; ]*\($_FPM_NAME *=\).*|\1 $_FPM_VALUE|" "$_FILE"
-    else
-        echo "${_FPM_NAME} = ${_FPM_VALUE}" >> "$_FILE"
-    fi
-done
-
-unset -v _FPM_CONF _FPM_WWW_CONF _FPM_NAME _FPM_VALUE _ENV_NAME _START _FILE
+conf_env FPM_ --pattern='!/^FPM_WWW_/' --comment=";" --file="$PHP_INI_DIR/php-fpm.conf"
+conf_env FPM_WWW_ --comment=";" --file="$PHP_INI_DIR/php-fpm.d/www.conf"

rootfs/docker-entrypoint.d/20-php.sh

@@ -4,33 +4,17 @@ set -e
 export PATH="$COMPOSER_HOME/vendor/bin:$PATH"
 
 if [ "$(id -u)" != 0 ] || [ "${PHP_RUNTIME_CONF-1}" != '1' ]; then
-    return
+  return
 fi
 
-_PHP_INI="$PHP_INI_DIR/php.ini"
-for _ENV_NAME in $(printenv | awk -F= '{print $1}'); do
-    if [ "${_ENV_NAME:0:8}" = "PHP_EXT_" ]; then
-        _PHP_EXT="$(echo "${_ENV_NAME:8}" | tr '[:upper:]' '[:lower:]')"
-        _PHP_EXT_FILE="$PHP_INI_DIR/conf.d/${_PHP_EXT}.ini"
-        if [ ! -f "$_PHP_EXT_FILE" ] || [ ! -w "$_PHP_EXT_FILE" ]; then
-            continue
-        fi
+conf_env PHP_ --pattern='!/^PHP_EXT_/' --comment=";" --file="$PHP_INI_DIR/php.ini"
 
-        _PHP_VALUE="$(eval echo "\${$_ENV_NAME}")"
-        if [ "${_PHP_VALUE}" = 1 ] || [ "${_PHP_VALUE}" = true ]; then
-            sed -i "s/^[; ]*\(zend_extension\|extension\)/\1/" "${_PHP_EXT_FILE}"
-        else
-            sed -i "s/^[; ]*\(zend_extension\|extension\)/;\1/" "${_PHP_EXT_FILE}"
-        fi
-    elif [ "${_ENV_NAME:0:4}" = "PHP_" ] && [ -w "$_PHP_INI" ]; then
-        _PHP_NAME="$(echo "${_ENV_NAME:4}" | sed -e 's|__|\.|g' | tr '[:upper:]' '[:lower:]')"
-        _PHP_VALUE="$(eval echo "\${$_ENV_NAME}")"
-        if grep "${_PHP_NAME} =" "$_PHP_INI" > /dev/null; then
-            sed -i "s|^[; ]*\($_PHP_NAME *=\).*|\1 $_PHP_VALUE|" "$_PHP_INI"
-        else
-            echo "${_PHP_NAME} = ${_PHP_VALUE}" >> "$_PHP_INI"
-        fi
-    fi
-done
+conf_env "PHP_EXT_" | while read -r extension value; do
+  file="$(find "$PHP_INI_DIR/conf.d" -name "*${extension}.ini" | head -1)"
+  if [ ! -f "$file" ] || [ ! -w "$file" ]; then
+    return
+  fi
 
-unset -v _PHP_INI _PHP_NAME _PHP_VALUE _ENV_NAME
+  if [ "${value}" = 1 ] || [ "${value}" = true ]; then prefix=; else prefix=";"; fi
+  sed -i "s/^[; ]*\(zend_extension\|extension\)/${prefix}\1/" "$file"
+done