From 1ab7cb2eafea033c129db7ca424a444ddd8790f4 Mon Sep 17 00:00:00 2001 From: noogen Date: Wed, 17 Jun 2020 12:14:43 -0500 Subject: [PATCH 1/2] fix fpm switch and restart --- rootfs/sysprepz/apache2-templates/php72fpm.sh | 2 +- rootfs/sysprepz/apache2-templates/php73fpm.sh | 2 +- rootfs/sysprepz/apache2-templates/php74fpm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/sysprepz/apache2-templates/php72fpm.sh b/rootfs/sysprepz/apache2-templates/php72fpm.sh index 80d7de9..61f94b9 100755 --- a/rootfs/sysprepz/apache2-templates/php72fpm.sh +++ b/rootfs/sysprepz/apache2-templates/php72fpm.sh @@ -43,7 +43,7 @@ rm -f /home/$user/web/$domain/cgi-bin/php*-fpm.conf # otherwise, simply use: # find /etc/init.d/ -name 'php*-fpm*' -type f -exec basename {} \; | xargs -I{} service {} restart || true phpfpms="7.2:7.3:7.4" -set -f # avoid globbing (expansion of *). + iphpfpm=(${phpfpms//:/ }) for i in "${!iphpfpm[@]}" do diff --git a/rootfs/sysprepz/apache2-templates/php73fpm.sh b/rootfs/sysprepz/apache2-templates/php73fpm.sh index 033c12f..258fcc7 100755 --- a/rootfs/sysprepz/apache2-templates/php73fpm.sh +++ b/rootfs/sysprepz/apache2-templates/php73fpm.sh @@ -43,7 +43,7 @@ rm -f /home/$user/web/$domain/cgi-bin/php*-fpm.conf # otherwise, simply use: # find /etc/init.d/ -name 'php*-fpm*' -type f -exec basename {} \; | xargs -I{} service {} restart || true phpfpms="7.2:7.3:7.4" -set -f # avoid globbing (expansion of *). + iphpfpm=(${phpfpms//:/ }) for i in "${!iphpfpm[@]}" do diff --git a/rootfs/sysprepz/apache2-templates/php74fpm.sh b/rootfs/sysprepz/apache2-templates/php74fpm.sh index 08f477c..60eb565 100755 --- a/rootfs/sysprepz/apache2-templates/php74fpm.sh +++ b/rootfs/sysprepz/apache2-templates/php74fpm.sh @@ -43,7 +43,7 @@ rm -f /home/$user/web/$domain/cgi-bin/php*-fpm.conf # otherwise, simply use: # find /etc/init.d/ -name 'php*-fpm*' -type f -exec basename {} \; | xargs -I{} service {} restart || true phpfpms="7.2:7.3:7.4" -set -f # avoid globbing (expansion of *). + iphpfpm=(${phpfpms//:/ }) for i in "${!iphpfpm[@]}" do From 71d9b892ae80d0674e89848f38c1bd41272f6fb8 Mon Sep 17 00:00:00 2001 From: noogen Date: Wed, 17 Jun 2020 12:15:03 -0500 Subject: [PATCH 2/2] change docker base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1760274..cffd6bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM niiknow/docker-hostingbase:1.5.2 +FROM niiknow/docker-hostingbase:1.5.3 LABEL maintainer="noogen " ENV DEBIAN_FRONTEND=noninteractive \ VESTA=/usr/local/vesta \