Skip to content

Commit

Permalink
[FIX] auto guess php mod ini directory
Browse files Browse the repository at this point in the history 
Related #52
  • Loading branch information
@htuscher
htuscher committed Oct 9, 2018
1 parent a213172 commit 5b01767
Show file tree
Hide file tree
Showing 26 changed files with 380 additions and 96 deletions.
2 changes: 0 additions & 2 deletions conf/provision.yml
View file
Expand Up @@ -41,8 +41,6 @@ provision:
php/general : '(debian|ubuntu|centos|alpine)' php/general : '(debian|ubuntu|centos|alpine)'
php/ubuntu-12.04 : ubuntu-12.04 php/ubuntu-12.04 : ubuntu-12.04
php/alpine : alpine php/alpine : alpine
php/debian-8 : '(debian-7|debian-8)'
php/debian-9 : '(debian-8-php7|debian-9)'
php-apache: php-apache:
configuration: configuration:
apache/general : '*' apache/general : '*'
Expand Down
24 changes: 20 additions & 4 deletions docker/php/alpine-php5/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
24 changes: 20 additions & 4 deletions docker/php/alpine-php7/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
24 changes: 20 additions & 4 deletions docker/php/centos-7-php56/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
24 changes: 20 additions & 4 deletions docker/php/centos-7-php7/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
24 changes: 20 additions & 4 deletions docker/php/centos-7/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
24 changes: 20 additions & 4 deletions docker/php/debian-7/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
3 changes: 0 additions & 3 deletions docker/php/debian-7/conf/provision/bootstrap.d/12-php-mod-conf.sh
View file

This file was deleted.

24 changes: 20 additions & 4 deletions docker/php/debian-8-php7/conf/provision/bootstrap.d/11-php-conf.sh
View file
Expand Up @@ -9,7 +9,11 @@ if [[ "$(version-compare "$PHP_VERSION" "5.99.999")" == "<" ]]; then
case "$IMAGE_FAMILY" in case "$IMAGE_FAMILY" in
Debian|Ubuntu) Debian|Ubuntu)
PHP_ETC_DIR=/etc/php5 PHP_ETC_DIR=/etc/php5
PHP_MOD_INI_DIR=/etc/php5/conf.d if [[ -d "/etc/php5/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php5/mods-available
else
PHP_MOD_INI_DIR=/etc/php5/conf.d
fi
PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php5/fpm/php-fpm.conf
PHP_POOL_CONF=www.conf PHP_POOL_CONF=www.conf
PHP_POOL_DIR=/etc/php5/fpm/pool.d PHP_POOL_DIR=/etc/php5/fpm/pool.d
Expand Down Expand Up @@ -57,19 +61,31 @@ elif [[ "$(version-compare "$PHP_VERSION" "7.99.999")" == "<" ]]; then
Debian|Ubuntu) Debian|Ubuntu)
if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then if [[ "$(version-compare "$PHP_VERSION" "7.2.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.2 PHP_ETC_DIR=/etc/php/7.2
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available if [[ -d "/etc/php/7.2/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.2/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.2/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.2/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d PHP_POOL_DIR=/etc/php/7.2/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.2 PHP_FPM_BIN=/usr/sbin/php-fpm7.2
elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then elif [[ "$(version-compare "$PHP_VERSION" "7.1.*")" == "=" ]]; then
PHP_ETC_DIR=/etc/php/7.1 PHP_ETC_DIR=/etc/php/7.1
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available if [[ -d "/etc/php/7.1/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.1/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.1/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.1/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d PHP_POOL_DIR=/etc/php/7.1/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.1 PHP_FPM_BIN=/usr/sbin/php-fpm7.1
else else
PHP_ETC_DIR=/etc/php/7.0 PHP_ETC_DIR=/etc/php/7.0
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available if [[ -d "/etc/php/7.0/mods-available" ]]; then
PHP_MOD_INI_DIR=/etc/php/7.0/mods-available
else
PHP_MOD_INI_DIR=/etc/php/7.0/conf.d
fi
PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf PHP_MAIN_CONF=/etc/php/7.0/fpm/php-fpm.conf
PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d PHP_POOL_DIR=/etc/php/7.0/fpm/pool.d
PHP_FPM_BIN=/usr/sbin/php-fpm7.0 PHP_FPM_BIN=/usr/sbin/php-fpm7.0
Expand Down
3 changes: 0 additions & 3 deletions docker/php/debian-8-php7/conf/provision/bootstrap.d/12-php-mod-conf.sh
View file

This file was deleted.

0 comments on commit 5b01767

Please sign in to comment.