diff --git a/7.2/alpine3.10/cli/docker-php-ext-enable b/7.2/alpine3.10/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.10/cli/docker-php-ext-enable +++ b/7.2/alpine3.10/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.10/cli/docker-php-ext-install b/7.2/alpine3.10/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.10/cli/docker-php-ext-install +++ b/7.2/alpine3.10/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/alpine3.10/fpm/docker-php-ext-enable b/7.2/alpine3.10/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.10/fpm/docker-php-ext-enable +++ b/7.2/alpine3.10/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.10/fpm/docker-php-ext-install b/7.2/alpine3.10/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.10/fpm/docker-php-ext-install +++ b/7.2/alpine3.10/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/alpine3.10/zts/docker-php-ext-enable b/7.2/alpine3.10/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.10/zts/docker-php-ext-enable +++ b/7.2/alpine3.10/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.10/zts/docker-php-ext-install b/7.2/alpine3.10/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.10/zts/docker-php-ext-install +++ b/7.2/alpine3.10/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/alpine3.11/cli/docker-php-ext-enable b/7.2/alpine3.11/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.11/cli/docker-php-ext-enable +++ b/7.2/alpine3.11/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.11/cli/docker-php-ext-install b/7.2/alpine3.11/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.11/cli/docker-php-ext-install +++ b/7.2/alpine3.11/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/alpine3.11/fpm/docker-php-ext-enable b/7.2/alpine3.11/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.11/fpm/docker-php-ext-enable +++ b/7.2/alpine3.11/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.11/fpm/docker-php-ext-install b/7.2/alpine3.11/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.11/fpm/docker-php-ext-install +++ b/7.2/alpine3.11/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/alpine3.11/zts/docker-php-ext-enable b/7.2/alpine3.11/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/alpine3.11/zts/docker-php-ext-enable +++ b/7.2/alpine3.11/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/alpine3.11/zts/docker-php-ext-install b/7.2/alpine3.11/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/alpine3.11/zts/docker-php-ext-install +++ b/7.2/alpine3.11/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/buster/apache/docker-php-ext-enable b/7.2/buster/apache/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/buster/apache/docker-php-ext-enable +++ b/7.2/buster/apache/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/buster/apache/docker-php-ext-install b/7.2/buster/apache/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/buster/apache/docker-php-ext-install +++ b/7.2/buster/apache/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/buster/cli/docker-php-ext-enable b/7.2/buster/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/buster/cli/docker-php-ext-enable +++ b/7.2/buster/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/buster/cli/docker-php-ext-install b/7.2/buster/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/buster/cli/docker-php-ext-install +++ b/7.2/buster/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/buster/fpm/docker-php-ext-enable b/7.2/buster/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/buster/fpm/docker-php-ext-enable +++ b/7.2/buster/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/buster/fpm/docker-php-ext-install b/7.2/buster/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/buster/fpm/docker-php-ext-install +++ b/7.2/buster/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/buster/zts/docker-php-ext-enable b/7.2/buster/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/buster/zts/docker-php-ext-enable +++ b/7.2/buster/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/buster/zts/docker-php-ext-install b/7.2/buster/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/buster/zts/docker-php-ext-install +++ b/7.2/buster/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/stretch/apache/docker-php-ext-enable b/7.2/stretch/apache/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/stretch/apache/docker-php-ext-enable +++ b/7.2/stretch/apache/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/stretch/apache/docker-php-ext-install b/7.2/stretch/apache/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/stretch/apache/docker-php-ext-install +++ b/7.2/stretch/apache/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/stretch/cli/docker-php-ext-enable b/7.2/stretch/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/stretch/cli/docker-php-ext-enable +++ b/7.2/stretch/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/stretch/cli/docker-php-ext-install b/7.2/stretch/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/stretch/cli/docker-php-ext-install +++ b/7.2/stretch/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/stretch/fpm/docker-php-ext-enable b/7.2/stretch/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/stretch/fpm/docker-php-ext-enable +++ b/7.2/stretch/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/stretch/fpm/docker-php-ext-install b/7.2/stretch/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/stretch/fpm/docker-php-ext-install +++ b/7.2/stretch/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.2/stretch/zts/docker-php-ext-enable b/7.2/stretch/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.2/stretch/zts/docker-php-ext-enable +++ b/7.2/stretch/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.2/stretch/zts/docker-php-ext-install b/7.2/stretch/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.2/stretch/zts/docker-php-ext-install +++ b/7.2/stretch/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.10/cli/docker-php-ext-enable b/7.3/alpine3.10/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.10/cli/docker-php-ext-enable +++ b/7.3/alpine3.10/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.10/cli/docker-php-ext-install b/7.3/alpine3.10/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.10/cli/docker-php-ext-install +++ b/7.3/alpine3.10/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.10/fpm/docker-php-ext-enable b/7.3/alpine3.10/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.10/fpm/docker-php-ext-enable +++ b/7.3/alpine3.10/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.10/fpm/docker-php-ext-install b/7.3/alpine3.10/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.10/fpm/docker-php-ext-install +++ b/7.3/alpine3.10/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.10/zts/docker-php-ext-enable b/7.3/alpine3.10/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.10/zts/docker-php-ext-enable +++ b/7.3/alpine3.10/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.10/zts/docker-php-ext-install b/7.3/alpine3.10/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.10/zts/docker-php-ext-install +++ b/7.3/alpine3.10/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.11/cli/docker-php-ext-enable b/7.3/alpine3.11/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.11/cli/docker-php-ext-enable +++ b/7.3/alpine3.11/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.11/cli/docker-php-ext-install b/7.3/alpine3.11/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.11/cli/docker-php-ext-install +++ b/7.3/alpine3.11/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.11/fpm/docker-php-ext-enable b/7.3/alpine3.11/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.11/fpm/docker-php-ext-enable +++ b/7.3/alpine3.11/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.11/fpm/docker-php-ext-install b/7.3/alpine3.11/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.11/fpm/docker-php-ext-install +++ b/7.3/alpine3.11/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/alpine3.11/zts/docker-php-ext-enable b/7.3/alpine3.11/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/alpine3.11/zts/docker-php-ext-enable +++ b/7.3/alpine3.11/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/alpine3.11/zts/docker-php-ext-install b/7.3/alpine3.11/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/alpine3.11/zts/docker-php-ext-install +++ b/7.3/alpine3.11/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/buster/apache/docker-php-ext-enable b/7.3/buster/apache/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/buster/apache/docker-php-ext-enable +++ b/7.3/buster/apache/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/buster/apache/docker-php-ext-install b/7.3/buster/apache/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/buster/apache/docker-php-ext-install +++ b/7.3/buster/apache/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/buster/cli/docker-php-ext-enable b/7.3/buster/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/buster/cli/docker-php-ext-enable +++ b/7.3/buster/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/buster/cli/docker-php-ext-install b/7.3/buster/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/buster/cli/docker-php-ext-install +++ b/7.3/buster/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/buster/fpm/docker-php-ext-enable b/7.3/buster/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/buster/fpm/docker-php-ext-enable +++ b/7.3/buster/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/buster/fpm/docker-php-ext-install b/7.3/buster/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/buster/fpm/docker-php-ext-install +++ b/7.3/buster/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/buster/zts/docker-php-ext-enable b/7.3/buster/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/buster/zts/docker-php-ext-enable +++ b/7.3/buster/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/buster/zts/docker-php-ext-install b/7.3/buster/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/buster/zts/docker-php-ext-install +++ b/7.3/buster/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/stretch/apache/docker-php-ext-enable b/7.3/stretch/apache/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/stretch/apache/docker-php-ext-enable +++ b/7.3/stretch/apache/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/stretch/apache/docker-php-ext-install b/7.3/stretch/apache/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/stretch/apache/docker-php-ext-install +++ b/7.3/stretch/apache/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/stretch/cli/docker-php-ext-enable b/7.3/stretch/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/stretch/cli/docker-php-ext-enable +++ b/7.3/stretch/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/stretch/cli/docker-php-ext-install b/7.3/stretch/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/stretch/cli/docker-php-ext-install +++ b/7.3/stretch/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/stretch/fpm/docker-php-ext-enable b/7.3/stretch/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/stretch/fpm/docker-php-ext-enable +++ b/7.3/stretch/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/stretch/fpm/docker-php-ext-install b/7.3/stretch/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/stretch/fpm/docker-php-ext-install +++ b/7.3/stretch/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.3/stretch/zts/docker-php-ext-enable b/7.3/stretch/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.3/stretch/zts/docker-php-ext-enable +++ b/7.3/stretch/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.3/stretch/zts/docker-php-ext-install b/7.3/stretch/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.3/stretch/zts/docker-php-ext-install +++ b/7.3/stretch/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.10/cli/docker-php-ext-enable b/7.4/alpine3.10/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.10/cli/docker-php-ext-enable +++ b/7.4/alpine3.10/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.10/cli/docker-php-ext-install b/7.4/alpine3.10/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.10/cli/docker-php-ext-install +++ b/7.4/alpine3.10/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.10/fpm/docker-php-ext-enable b/7.4/alpine3.10/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.10/fpm/docker-php-ext-enable +++ b/7.4/alpine3.10/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.10/fpm/docker-php-ext-install b/7.4/alpine3.10/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.10/fpm/docker-php-ext-install +++ b/7.4/alpine3.10/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.10/zts/docker-php-ext-enable b/7.4/alpine3.10/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.10/zts/docker-php-ext-enable +++ b/7.4/alpine3.10/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.10/zts/docker-php-ext-install b/7.4/alpine3.10/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.10/zts/docker-php-ext-install +++ b/7.4/alpine3.10/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.11/cli/docker-php-ext-enable b/7.4/alpine3.11/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.11/cli/docker-php-ext-enable +++ b/7.4/alpine3.11/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.11/cli/docker-php-ext-install b/7.4/alpine3.11/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.11/cli/docker-php-ext-install +++ b/7.4/alpine3.11/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.11/fpm/docker-php-ext-enable b/7.4/alpine3.11/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.11/fpm/docker-php-ext-enable +++ b/7.4/alpine3.11/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.11/fpm/docker-php-ext-install b/7.4/alpine3.11/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.11/fpm/docker-php-ext-install +++ b/7.4/alpine3.11/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/alpine3.11/zts/docker-php-ext-enable b/7.4/alpine3.11/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/alpine3.11/zts/docker-php-ext-enable +++ b/7.4/alpine3.11/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/alpine3.11/zts/docker-php-ext-install b/7.4/alpine3.11/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/alpine3.11/zts/docker-php-ext-install +++ b/7.4/alpine3.11/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/buster/apache/docker-php-ext-enable b/7.4/buster/apache/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/buster/apache/docker-php-ext-enable +++ b/7.4/buster/apache/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/buster/apache/docker-php-ext-install b/7.4/buster/apache/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/buster/apache/docker-php-ext-install +++ b/7.4/buster/apache/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/buster/cli/docker-php-ext-enable b/7.4/buster/cli/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/buster/cli/docker-php-ext-enable +++ b/7.4/buster/cli/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/buster/cli/docker-php-ext-install b/7.4/buster/cli/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/buster/cli/docker-php-ext-install +++ b/7.4/buster/cli/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/buster/fpm/docker-php-ext-enable b/7.4/buster/fpm/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/buster/fpm/docker-php-ext-enable +++ b/7.4/buster/fpm/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/buster/fpm/docker-php-ext-install b/7.4/buster/fpm/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/buster/fpm/docker-php-ext-install +++ b/7.4/buster/fpm/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/7.4/buster/zts/docker-php-ext-enable b/7.4/buster/zts/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/7.4/buster/zts/docker-php-ext-enable +++ b/7.4/buster/zts/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/7.4/buster/zts/docker-php-ext-install b/7.4/buster/zts/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/7.4/buster/zts/docker-php-ext-install +++ b/7.4/buster/zts/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done diff --git a/docker-php-ext-enable b/docker-php-ext-enable index 3d079d21..8137f796 100755 --- a/docker-php-ext-enable +++ b/docker-php-ext-enable @@ -103,7 +103,15 @@ for module in $modules; do continue fi - ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + case "$iniName" in + /*) + # allow an absolute path + ini="$iniName" + ;; + *) + ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}" + ;; + esac if ! grep -q "$line" "$ini" 2>/dev/null; then echo "$line" >> "$ini" fi diff --git a/docker-php-ext-install b/docker-php-ext-install index 1afa6627..f377be4d 100755 --- a/docker-php-ext-install +++ b/docker-php-ext-install @@ -19,7 +19,7 @@ fi cd /usr/src/php/ext usage() { - echo "usage: $0 [-jN] ext-name [ext-name ...]" + echo "usage: $0 [-jN] [--ini-name file.ini] ext-name [ext-name ...]" echo " ie: $0 gd mysqli" echo " $0 pdo pdo_mysql" echo " $0 -j5 gd mbstring mysqli pdo pdo_mysql shmop" @@ -41,15 +41,17 @@ usage() { echo 'the output of "php -i" to see which modules are already loaded.' } -opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })" +opts="$(getopt -o 'h?j:' --long 'help,ini-name:,jobs:' -- "$@" || { usage >&2 && false; })" eval set -- "$opts" j=1 +iniName= while true; do flag="$1" shift case "$flag" in --help|-h|'-?') usage && exit 0 ;; + --ini-name) iniName="$1" && shift ;; --jobs|-j) j="$1" && shift ;; --) break ;; *) @@ -108,7 +110,7 @@ for ext in $exts; do -maxdepth 1 \ -name '*.so' \ -exec basename '{}' ';' \ - | xargs -r docker-php-ext-enable + | xargs -r docker-php-ext-enable ${iniName:+--ini-name "$iniName"} make -j"$j" clean cd "$popDir" done