Release 7.3.1 - See CHANGELOG.md

tiredofit · Dec 14, 2022 · edcac49 · edcac49
1 parent 1427ea8
commit edcac49
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.3.1 2022-12-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Patchup for 8.2.x on Alpine systems
+
+
 ## 7.3.0 2022-12-11 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/assets/functions/20-php-fpm b/install/assets/functions/20-php-fpm
@@ -4,15 +4,21 @@ phpfpm_bootstrap() {
     os=$(cat /etc/os-release |grep ^ID= | cut -d = -f2)
     case ${os} in
         "alpine" )
-            if [ "${PHP_BASE}" = "8.1" ] ; then
-              php_prefix="/etc/php81/"
-            else
-              php_prefix="/etc/php$(php -v | head -n 1 | awk '{print $2}' | cut -c 1)/"
-            fi
-            ;;
+            case "${PHP_BASE}" in
+                8.1 )
+                    php_prefix="/etc/php81/"
+                ;;
+                8.2 )
+                    php_prefix="/etc/php82/"
+                ;;
+                * )
+                    php_prefix="/etc/php$(php -v | head -n 1 | awk '{print $2}' | cut -c 1)/"
+                ;;
+            esac
+        ;;
         "debian" )
             php_prefix="/etc/php/$(php -v | head -n 1 | awk '{print $2}' | cut -c 1-3)/"
-            ;;
+        ;;
     esac
 
     case "${PHP_BASE}" in

diff --git a/install/usr/sbin/php-ext b/install/usr/sbin/php-ext
@@ -1,25 +1,32 @@
 #!/command/with-contenv /bin/bash
 source /assets/functions/00-container
 
+
 php_major_version="$(echo ${PHP_BASE} | cut -c 1-1)"
 os=$(cat /etc/os-release |grep ^ID= | cut -d = -f2)
 
 case ${os} in
     "alpine" )
-        if [ "${PHP_BASE}" = "8.1" ] ; then
-          php_prefix="/etc/php81/"
-        else
-          php_prefix="/etc/php$(php -v | head -n 1 | awk '{print $2}' | cut -c 1)/"
-        fi
-        ;;
+        case "${PHP_BASE}" in
+            8.1 )
+                php_prefix="/etc/php81/"
+            ;;
+            8.2 )
+                php_prefix="/etc/php82/"
+            ;;
+            * )
+                php_prefix="/etc/php$(php -v | head -n 1 | awk '{print $2}' | cut -c 1)/"
+            ;;
+        esac
+    ;;
     "debian" )
         php_prefix="/etc/php/$(php -v | head -n 1 | awk '{print $2}' | cut -c 1-3)/"
-        ;;
+    ;;
 esac
 
-if [ "${PHP_ENABLE_OPENSSL,,}" = "true" ] && [ -f "${php_prefix}mods-available/openssl.ini" ]; then
-    export PHP_ENABLE_OPENSSL=FALSE;
-fi;
+if [ "${PHP_ENABLE_OPENSSL,,}" = "true" ] && [ ! -f "${php_prefix}mods-available/openssl.ini" ]; then
+    export PHP_ENABLE_OPENSSL=FALSE
+fi
 
 enable_module () {
     if [ -n "$1" ]; then