Release 7.0.8 - See CHANGELOG.md

tiredofit · Aug 8, 2022 · 277d70f · 277d70f
1 parent 1876b23
commit 277d70f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -233,7 +233,7 @@ jobs:
 
             case ${BRANCH} in
               "main" | "master" )
-                  BRANCHTAG="${DOCKER_IMAGE}:${PHP_BASE},${DOCKER_IMAGE}:${PHP_BASE}-${OS},${DOCKER_IMAGE}:${PHP_BASE}-${OS}_${DISTRIB},${DOCKER_IMAGE}:${PHP_BASE}-${OS}_${DISTRIB}-latest,${DOCKER_IMAGE}:${OS}-${PHP_BASE},${DOCKER_IMAGE}:${OS}-${PHP_BASE}-${DISTRIB},${DOCKER_IMAGE}:${OS}-${PHP_BASE}-${DISTRIB}-latest,${DOCKER_IMAGE}:${OS},${DOCKER_IMAGE}:${PHP_BASE}-latest,${DOCKER_IMAGE}:latest
+                  BRANCHTAG="${DOCKER_IMAGE}:${PHP_BASE},${DOCKER_IMAGE}:${PHP_BASE}-${OS},${DOCKER_IMAGE}:${PHP_BASE}-${OS}_${DISTRIB},${DOCKER_IMAGE}:${PHP_BASE}-${OS}_${DISTRIB}-latest,${DOCKER_IMAGE}:${OS}-${PHP_BASE},${DOCKER_IMAGE}:${OS}-${PHP_BASE}-${DISTRIB},${DOCKER_IMAGE}:${OS}-${PHP_BASE}-${DISTRIB}-latest,${DOCKER_IMAGE}:${OS},${DOCKER_IMAGE}:${PHP_BASE}-latest,${DOCKER_IMAGE}:latest"
                 ;;
               "develop" )
                   BRANCHTAG="${DOCKER_IMAGE}:develop"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 7.0.8 2022-08-08 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for Kitchen Sink mode showing pathnames on print_notice command
+      - Stop using log_length parameter for < PHP-FPM 7.3
+
+
 ## 7.0.7 2022-07-18 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
@@ -14,6 +14,12 @@ phpfpm_bootstrap() {
             php_prefix="/etc/php/$(php -v | head -n 1 | awk '{print $2}' | cut -c 1-3)/"
             ;;
     esac
+
+    case "${PHP_BASE}" in
+        "5.6" | "7.0" | "7.1" | "7.2" )
+            sed "/log_limit =/d" /assets/php-fpm/fpm/php-fpm.conf
+        ;;
+    esac
 }
 
 phpfpm_configure_authentication() {
@@ -139,7 +145,7 @@ EOF
             silent php-ext enable all
             php_actual_plugins_enabled="${php_actual_plugins_enabled} ${f/.ini/}"
         done
-        print_notice "PHP-FPM Preparing to start with the following plugins enabled: ${php_actual_plugins_enabled}"
+        print_notice "PHP-FPM Preparing to start with the following plugins enabled: $(echo ${php_actual_plugins_enabled} | sed 's|/etc/php7/mods-available/||g' | sed 's| |,|g' )"
   fi
 }