From 1cf26d934af6179e86a5216c5b2d851d86feb94a Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Mon, 18 Nov 2024 07:19:55 -0800
Subject: [PATCH 1/9] Release 7.10.20 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ee7d6..065c08e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.20 2024-11-18 <dave at tiredofit dot ca>
+
+   ### Added
+      - Fluent-Bit 3.2.1
+
+
 ## 7.10.19 2024-11-11 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 6fd0fbe..21ba3ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG S6_OVERLAY_VERSION
 ARG YQ_VERSION
 ARG ZABBIX_VERSION
 
-ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.2.0"} \
+ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.2.1"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \

From 118743016a8a4596380743d17d8e3c56fc13dd7a Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Wed, 20 Nov 2024 08:04:15 -0800
Subject: [PATCH 2/9] Release 7.10.21 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 065c08e..19754de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.21 2024-11-20 <dave at tiredofit dot ca>
+
+   ### Added
+      - Zabbix Agent 7.0.6
+
+
 ## 7.10.20 2024-11-18 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 21ba3ec..73a1129 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG ZABBIX_VERSION
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.2.1"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
-    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \
+    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.6"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \
     DEBUG_MODE=FALSE \
     TIMEZONE=Etc/GMT \

From e81419e50070a584c8d84b9d9691e66ff07da50e Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 5 Dec 2024 07:50:03 -0800
Subject: [PATCH 3/9] Release 7.10.22 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19754de..8fae27a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.22 2024-12-05 <dave at tiredofit dot ca>
+
+   ### Added
+      - Rollback to Zabbix Agent 7.0.5
+
+
 ## 7.10.21 2024-11-20 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 73a1129..4f1dbd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG DEBIAN_VERSION=bookworm
 FROM docker.io/debian:${DEBIAN_VERSION}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-ARG GOLANG_VERSION=1.22.4
+ARG GOLANG_VERSION=1.23.3
 ARG DOAS_VERSION
 ARG FLUENTBIT_VERSION
 ARG S6_OVERLAY_VERSION
@@ -13,7 +13,7 @@ ARG ZABBIX_VERSION
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.2.1"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
-    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.6"} \
+    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \
     DEBUG_MODE=FALSE \
     TIMEZONE=Etc/GMT \

From bbdd7f1b74b9128d6b454f30c8c7b181c3fdfa93 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 5 Dec 2024 07:59:21 -0800
Subject: [PATCH 4/9] Release 7.10.23 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fae27a..7b419c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.23 2024-12-05 <dave at tiredofit dot ca>
+
+   ### Added
+      - Downgrade to Fluent-bit 3.1.10
+
+
 ## 7.10.22 2024-12-05 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 4f1dbd6..3c0e583 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG S6_OVERLAY_VERSION
 ARG YQ_VERSION
 ARG ZABBIX_VERSION
 
-ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.2.1"} \
+ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.10"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \

From 9a96e907e737ffa8bd51b7e6cffb24b1db49c83e Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Wed, 11 Dec 2024 19:35:32 -0800
Subject: [PATCH 5/9] Release 7.10.27 - See CHANGELOG.md

---
 CHANGELOG.md                          |  6 ++++++
 install/assets/functions/00-container | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b419c1..baeb831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.27 2024-12-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Set db_ready function to use disable ssl for mysql checks by default
+
+
 ## 7.10.23 2024-12-05 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
index 3de407d..dba41d9 100755
--- a/install/assets/functions/00-container
+++ b/install/assets/functions/00-container
@@ -224,7 +224,7 @@ db_ready() {
     ## Usage db_ready <dbtype>
     output_off
     print_debug "Checking to see if Database Type $1 is ready"
-    case "$1" in
+    case "${1,,}" in
         "couch" | "couchdb" )
             transform_file_var DB_PORT
             if [ -n "${DB_PORT}" ] ; then couch_port=${DB_PORT} ; fi ;
@@ -277,15 +277,21 @@ db_ready() {
                 print_warn "Mongo Host '${mongo_host}' is not accessible, retrying.. ($counter seconds so far)"
             done
         ;;
-        "mysql" | "mariadb" | "MARIADB" | "MYSQL" )
-            if command -v "mysqladmin" &> /dev/null ; then
-                mysqladmin_bin="$(which mysqladmin)"
-            elif command -v "mariadb-admin" &> /dev/null ; then
+        "mysql" | "mariadb" )
+            if command -v "mariadb-admin" &> /dev/null ; then
                 mysqladmin_bin="$(which mariadb-admin)"
+            elif command -v "mysqladmin" &> /dev/null ; then
+                mysqladmin_bin="$(which mysqladmin)"
             else
                 print_error "No MySQL or MariaDB client detected - Cannot check for Database"
                 exit 1
             fi
+            if [ ! -f /etc/my.cnf.d/disable-ssl.cnf ] ; then
+                cat <<EOF > /etc/my.cnf.d/disable-ssl.cnf
+[client]
+ssl=FALSE
+EOF
+            fi
             transform_file_var DB_PORT
             if [ -n "${DB_PORT}" ] ; then maria_port=${DB_PORT} ; fi ;
             transform_file_var MYSQL_PORT

From cafd95b0579f69dbb101d0ebf69d1238716c6cd3 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Mon, 24 Feb 2025 08:53:15 -0800
Subject: [PATCH 6/9] Release 7.10.28 - See CHANGELOG.md

---
 1                                             |  2 +
 CHANGELOG.md                                  |  6 ++
 Dockerfile                                    |  3 +-
 README.md                                     |  6 +-
 install/assets/defaults/00-container          |  2 +-
 install/assets/functions/00-container         | 62 +++++++++----------
 install/etc/cont-init.d/00-startup            |  2 +-
 install/etc/cont-init.d/01-timezone           |  2 +-
 install/etc/cont-init.d/02-permissions        |  2 +-
 install/etc/cont-init.d/03-monitoring         |  2 +-
 install/etc/cont-init.d/04-scheduling         |  2 +-
 install/etc/cont-init.d/05-logging            |  2 +-
 install/etc/cont-init.d/06-messaging          |  2 +-
 install/etc/cont-init.d/07-firewall           |  2 +-
 install/etc/cont-init.d/99-container          |  2 +-
 .../etc/services.available/03-monitoring/run  |  2 +-
 .../etc/services.available/04-scheduling/run  |  2 +-
 install/etc/services.available/05-logging/run |  2 +-
 .../etc/services.available/07-firewall/run    |  2 +-
 19 files changed, 57 insertions(+), 50 deletions(-)
 create mode 100644 1

diff --git a/1 b/1
new file mode 100644
index 0000000..13d8ae4
--- /dev/null
+++ b/1
@@ -0,0 +1,2 @@
+id: ‘dave2’: no such user
+id: ‘2’: no such user
diff --git a/CHANGELOG.md b/CHANGELOG.md
index baeb831..888c376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.28 2025-02-24 <dave at tiredofit dot ca>
+
+   ### Added
+      - Zabbix Agent 7.0.10
+
+
 ## 7.10.27 2024-12-11 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/Dockerfile b/Dockerfile
index 3c0e583..939790d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG ZABBIX_VERSION
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.10"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
-    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.5"} \
+    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.7"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \
     DEBUG_MODE=FALSE \
     TIMEZONE=Etc/GMT \
@@ -79,7 +79,6 @@ RUN debArch=$(dpkg --print-architecture) && \
                     procps \
                     sudo \
                     tzdata \
-                    vim-tiny \
                     zstd \
                     ${ZABBIX_BUILD_DEPS} ${FLUENTBIT_BUILD_DEPS} \
                     && \
diff --git a/README.md b/README.md
index d3da0a0..8a41028 100644
--- a/README.md
+++ b/README.md
@@ -482,7 +482,7 @@ See `/assets/functions/00-container` for more detailed documentation for the var
 #!/command/with-contenv bash          # Pull in Container Environment Variables from Dockerfile/Docker Runtime
 source /assets/functions/00-container # Pull in all custom container functions from this image
 prepare_service single                # Read functions and defaults only from files matching this script filename - see detailed docs for more
-PROCESS_NAME="process"                # set the prefix for any logging
+SERVICE_NAME="process"                # set the prefix for any logging
 
 .. your scripting ..
 print_info "This an INFO log"
@@ -500,7 +500,7 @@ liftoff                               # this writes to the state files at /tmp/.
 #!/command/with-contenv bash          # Pull in Container Environment Variables from Dockerfile/Docker Runtime
 source /assets/functions/00-container # Pull in all custom container functions from this image
 prepare_service defaults single       # Read defaults only from files matching this script filename - see detailed docs for more
-PROCESS_NAME="process"                # set the prefix for any logging
+SERVICE_NAME="process"                # set the prefix for any logging
 
 check_container_initialized           # Check to make sure that the container properly initialized before proceeding
 check_service_initialized init        # Check to see if the cont-init.d/scriptname executed correctly, otherwise wait until it has done
@@ -514,7 +514,7 @@ fakeprocess (args)                    # whatever your process you want to start
 | ----------------------------- | ------------------------------------------------------------------------------ | ----------- |
 | `CONTAINER_SKIP_SANITY_CHECK` | Skip the checking to see if all scripts in /etc/cont-init.d executed correctly | `FALSE`     |
 | `DEBUG_MODE`                  | Show all script output (set -x)                                                | `FALSE`     |
-| `PROCESS_NAME`                | Used for prefixing the script that is running                                  | `container` |
+| `SERVICE_NAME`                | Used for prefixing the script that is running                                  | `container` |
 
 ## Debug Mode
 
diff --git a/install/assets/defaults/00-container b/install/assets/defaults/00-container
index d42c664..ae1f578 100755
--- a/install/assets/defaults/00-container
+++ b/install/assets/defaults/00-container
@@ -43,6 +43,6 @@ CONTAINER_SCHEDULING_BACKEND=${CONTAINER_SCHEDULING_BACKEND:-"cron"}
 CONTAINER_SCHEDULING_LOCATION=${CONTAINER_SCHEDULING_LOCATION:-"/assets/cron/"}
 CONTAINER_SKIP_SANITY_CHECK=${CONTAINER_SKIP_SANITY_CHECK:-"FALSE"}
 DEBUG_MODE=${DEBUG_MODE:-"FALSE"}
-PROCESS_NAME=${PROCESS_NAME:-"container"}
+SERVICE_NAME=${SERVICE_NAME:-"container"}
 # shellcheck disable=SC2034
 SCRIPTPATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 || exit ; pwd -P)"
diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
index dba41d9..4647596 100755
--- a/install/assets/functions/00-container
+++ b/install/assets/functions/00-container
@@ -936,15 +936,15 @@ print_debug() {
         "debug" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[DEBUG] ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[DEBUG] ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} ** [${SERVICE_NAME}] $1"
                 fi
             fi
         ;;
@@ -952,7 +952,7 @@ print_debug() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" )
-            echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -964,15 +964,15 @@ print_error() {
         "debug" | "notice" | "warn" | "error")
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${blr}[ERROR]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${blr}[ERROR]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[ERROR] ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[ERROR] ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${blr}[ERROR]${boff} ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${blr}[ERROR]${boff} ** [${SERVICE_NAME}] $1"
                 fi
             fi
         ;;
@@ -980,7 +980,7 @@ print_error() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" | "warn" | "error")
-            echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -990,19 +990,19 @@ print_info() {
     output_off
     if [ "${DEBUG_MODE,,}" = "true" ] ; then
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+            echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
         else
-            echo -e "$(log_prefix)${bdg}[INFO]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+            echo -e "$(log_prefix)${bdg}[INFO]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
         fi
     else
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[INFO] ** [${PROCESS_NAME}] $1"
+            echo -e "$(log_prefix)[INFO] ** [${SERVICE_NAME}] $1"
         else
-            echo -e "$(log_prefix)${bdg}[INFO]${boff} ** [${PROCESS_NAME}] $1"
+            echo -e "$(log_prefix)${bdg}[INFO]${boff} ** [${SERVICE_NAME}] $1"
         fi
     fi
 
-    echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+    echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     output_on
 }
 
@@ -1012,15 +1012,15 @@ print_notice() {
         "debug" | "notice" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[NOTICE] ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[NOTICE] ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} ** [${SERVICE_NAME}] $1"
                 fi
             fi
         ;;
@@ -1028,7 +1028,7 @@ print_notice() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" )
-            echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -1070,19 +1070,19 @@ print_start() {
 
     if [ "${DEBUG_MODE,,}" = "true" ] ; then
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
 
         else
-            echo -e "$(log_prefix)${bdg}[STARTING]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)${bdg}[STARTING]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
         fi
-        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     else
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[STARTING] ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)[STARTING] ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
         else
-            echo -e "$(log_prefix)${bdg}[STARTING]${boff} ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)${bdg}[STARTING]${boff} ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
         fi
-        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     fi
     output_on
 }
@@ -1093,22 +1093,22 @@ print_warn() {
         "debug" | "notice" | "warn" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdb}[WARN]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdb}[WARN]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdb}[WARN]${boff} ** [${PROCESS_NAME}] $1"
+                    echo -e "$(log_prefix)${bdb}[WARN]${boff} ** [${SERVICE_NAME}] $1"
                 fi
             fi
     esac
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" | "warn" )
-            echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     esac
 
     output_on
diff --git a/install/etc/cont-init.d/00-startup b/install/etc/cont-init.d/00-startup
index b41a860..41fb165 100755
--- a/install/etc/cont-init.d/00-startup
+++ b/install/etc/cont-init.d/00-startup
@@ -4,7 +4,7 @@ chmod -f -R 0755 /assets/{defaults,functions} > /dev/null 2>&1
 chmod -f -R 0755 /etc/{cont-init.d,cont-finish.d,services.available} > /dev/null 2>&1
 source /assets/functions/00-container
 output_off
-PROCESS_NAME="container-init"
+SERVICE_NAME="container-init"
 showoff
 
 # Clean OS logroate directory
diff --git a/install/etc/cont-init.d/01-timezone b/install/etc/cont-init.d/01-timezone
index ea776a6..037110f 100755
--- a/install/etc/cont-init.d/01-timezone
+++ b/install/etc/cont-init.d/01-timezone
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-PROCESS_NAME="timezone"
+SERVICE_NAME="timezone"
 
 ### Timezone setup
 if [ -n "${TIMEZONE}" ]; then
diff --git a/install/etc/cont-init.d/02-permissions b/install/etc/cont-init.d/02-permissions
index c7e3b9f..86e3ae1 100755
--- a/install/etc/cont-init.d/02-permissions
+++ b/install/etc/cont-init.d/02-permissions
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 # shellcheck disable=SC2034
-PROCESS_NAME="permissions"
+SERVICE_NAME="permissions"
 
 ## Legacy
 if var_true "${ENABLE_PERMISSIONS}" ; then
diff --git a/install/etc/cont-init.d/03-monitoring b/install/etc/cont-init.d/03-monitoring
index 635da24..d2b8147 100755
--- a/install/etc/cont-init.d/03-monitoring
+++ b/install/etc/cont-init.d/03-monitoring
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service single
-PROCESS_NAME="monitoring"
+SERVICE_NAME="monitoring"
 
 ## Legacy
 if var_false "${ENABLE_ZABBIX}"; then CONTAINER_ENABLE_MONITORING=FALSE ; fi
diff --git a/install/etc/cont-init.d/04-scheduling b/install/etc/cont-init.d/04-scheduling
index ef70533..0a5cd97 100755
--- a/install/etc/cont-init.d/04-scheduling
+++ b/install/etc/cont-init.d/04-scheduling
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service single
-PROCESS_NAME="scheduling"
+SERVICE_NAME="scheduling"
 
 
 
diff --git a/install/etc/cont-init.d/05-logging b/install/etc/cont-init.d/05-logging
index 1a9a87d..3e700e9 100755
--- a/install/etc/cont-init.d/05-logging
+++ b/install/etc/cont-init.d/05-logging
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service
-PROCESS_NAME="logging"
+SERVICE_NAME="logging"
 
 
 if var_true "${CONTAINER_ENABLE_LOGROTATE}" ; then
diff --git a/install/etc/cont-init.d/06-messaging b/install/etc/cont-init.d/06-messaging
index 0bd5d1a..a6158c5 100755
--- a/install/etc/cont-init.d/06-messaging
+++ b/install/etc/cont-init.d/06-messaging
@@ -4,7 +4,7 @@ source /assets/functions/00-container
 output_off
 prepare_service single
 # shellcheck disable=SC2034
-PROCESS_NAME="messaging"
+SERVICE_NAME="messaging"
 
 output_off
 
diff --git a/install/etc/cont-init.d/07-firewall b/install/etc/cont-init.d/07-firewall
index 08c18f8..cb6fbc8 100755
--- a/install/etc/cont-init.d/07-firewall
+++ b/install/etc/cont-init.d/07-firewall
@@ -4,7 +4,7 @@ source /assets/functions/00-container
 output_off
 prepare_service
 # shellcheck disable=SC2034
-PROCESS_NAME="firewall"
+SERVICE_NAME="firewall"
 
 firewall_command=$(which "${CONTAINER_FIREWALL_BACKEND,,}")
 
diff --git a/install/etc/cont-init.d/99-container b/install/etc/cont-init.d/99-container
index c024d64..75243b3 100755
--- a/install/etc/cont-init.d/99-container
+++ b/install/etc/cont-init.d/99-container
@@ -3,7 +3,7 @@
 source /assets/defaults/00-container
 source /assets/functions/00-container
 output_off
-PROCESS_NAME="container"
+SERVICE_NAME="container"
 
 if var_false "${CONTAINER_SKIP_SANITY_CHECK}" ; then
 
diff --git a/install/etc/services.available/03-monitoring/run b/install/etc/services.available/03-monitoring/run
index 96419d4..70517c1 100755
--- a/install/etc/services.available/03-monitoring/run
+++ b/install/etc/services.available/03-monitoring/run
@@ -1,7 +1,7 @@
 #!/command/with-contenv bash
 
 source /assets/functions/00-container
-PROCESS_NAME="monitoring"
+SERVICE_NAME="monitoring"
 output_off
 prepare_service defaults single
 check_container_initialized
diff --git a/install/etc/services.available/04-scheduling/run b/install/etc/services.available/04-scheduling/run
index 96e3aeb..3a6277e 100755
--- a/install/etc/services.available/04-scheduling/run
+++ b/install/etc/services.available/04-scheduling/run
@@ -1,7 +1,7 @@
 #!/command/with-contenv bash
 
 source /assets/functions/00-container
-PROCESS_NAME="scheduling"
+SERVICE_NAME="scheduling"
 output_off
 prepare_service
 check_container_initialized
diff --git a/install/etc/services.available/05-logging/run b/install/etc/services.available/05-logging/run
index d1743b2..24ae6cc 100755
--- a/install/etc/services.available/05-logging/run
+++ b/install/etc/services.available/05-logging/run
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-PROCESS_NAME="logging"
+SERVICE_NAME="logging"
 prepare_service defaults single
 check_container_initialized
 check_service_initialized init
diff --git a/install/etc/services.available/07-firewall/run b/install/etc/services.available/07-firewall/run
index 365987f..24305a6 100755
--- a/install/etc/services.available/07-firewall/run
+++ b/install/etc/services.available/07-firewall/run
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-PROCESS_NAME="firewall"
+SERVICE_NAME="firewall"
 prepare_service defaults single
 check_container_initialized
 check_service_initialized init

From 713b0825d617fe2247d39f64d1be46e4f872baa0 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Sat, 26 Apr 2025 12:08:07 -0700
Subject: [PATCH 7/9] Release 7.10.29 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 888c376..957358e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.29 2025-04-26 <dave at tiredofit dot ca>
+
+   ### Added
+      - Zabbix Agent 7.2.6
+
+
 ## 7.10.28 2025-02-24 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 939790d..da958b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG DEBIAN_VERSION=bookworm
 FROM docker.io/debian:${DEBIAN_VERSION}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-ARG GOLANG_VERSION=1.23.3
+ARG GOLANG_VERSION=1.24.2
 ARG DOAS_VERSION
 ARG FLUENTBIT_VERSION
 ARG S6_OVERLAY_VERSION
@@ -13,7 +13,7 @@ ARG ZABBIX_VERSION
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.10"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
-    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.7"} \
+    ZABBIX_VERSION=${ZABBIX_VERSION:-"7.2.6"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \
     DEBUG_MODE=FALSE \
     TIMEZONE=Etc/GMT \

From 34b601d7c86e88fa7d1ccd33642be13214e21c96 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Sat, 26 Apr 2025 12:08:34 -0700
Subject: [PATCH 8/9] Release 7.10.30 - See CHANGELOG.md

---
 CHANGELOG.md                                  |  6 ++
 README.md                                     |  6 +-
 install/assets/defaults/00-container          |  2 +-
 install/assets/functions/00-container         | 62 +++++++++----------
 install/etc/cont-init.d/00-startup            |  2 +-
 install/etc/cont-init.d/01-timezone           |  2 +-
 install/etc/cont-init.d/02-permissions        |  2 +-
 install/etc/cont-init.d/03-monitoring         |  2 +-
 install/etc/cont-init.d/04-scheduling         |  2 +-
 install/etc/cont-init.d/05-logging            |  2 +-
 install/etc/cont-init.d/06-messaging          |  2 +-
 install/etc/cont-init.d/07-firewall           |  2 +-
 install/etc/cont-init.d/99-container          |  2 +-
 .../etc/services.available/03-monitoring/run  |  2 +-
 .../etc/services.available/04-scheduling/run  |  2 +-
 install/etc/services.available/05-logging/run |  2 +-
 .../etc/services.available/07-firewall/run    |  2 +-
 17 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 957358e..565ebf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.30 2025-04-26 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix SERVICE_NAME insertion
+
+
 ## 7.10.29 2025-04-26 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/README.md b/README.md
index 8a41028..d3da0a0 100644
--- a/README.md
+++ b/README.md
@@ -482,7 +482,7 @@ See `/assets/functions/00-container` for more detailed documentation for the var
 #!/command/with-contenv bash          # Pull in Container Environment Variables from Dockerfile/Docker Runtime
 source /assets/functions/00-container # Pull in all custom container functions from this image
 prepare_service single                # Read functions and defaults only from files matching this script filename - see detailed docs for more
-SERVICE_NAME="process"                # set the prefix for any logging
+PROCESS_NAME="process"                # set the prefix for any logging
 
 .. your scripting ..
 print_info "This an INFO log"
@@ -500,7 +500,7 @@ liftoff                               # this writes to the state files at /tmp/.
 #!/command/with-contenv bash          # Pull in Container Environment Variables from Dockerfile/Docker Runtime
 source /assets/functions/00-container # Pull in all custom container functions from this image
 prepare_service defaults single       # Read defaults only from files matching this script filename - see detailed docs for more
-SERVICE_NAME="process"                # set the prefix for any logging
+PROCESS_NAME="process"                # set the prefix for any logging
 
 check_container_initialized           # Check to make sure that the container properly initialized before proceeding
 check_service_initialized init        # Check to see if the cont-init.d/scriptname executed correctly, otherwise wait until it has done
@@ -514,7 +514,7 @@ fakeprocess (args)                    # whatever your process you want to start
 | ----------------------------- | ------------------------------------------------------------------------------ | ----------- |
 | `CONTAINER_SKIP_SANITY_CHECK` | Skip the checking to see if all scripts in /etc/cont-init.d executed correctly | `FALSE`     |
 | `DEBUG_MODE`                  | Show all script output (set -x)                                                | `FALSE`     |
-| `SERVICE_NAME`                | Used for prefixing the script that is running                                  | `container` |
+| `PROCESS_NAME`                | Used for prefixing the script that is running                                  | `container` |
 
 ## Debug Mode
 
diff --git a/install/assets/defaults/00-container b/install/assets/defaults/00-container
index ae1f578..d42c664 100755
--- a/install/assets/defaults/00-container
+++ b/install/assets/defaults/00-container
@@ -43,6 +43,6 @@ CONTAINER_SCHEDULING_BACKEND=${CONTAINER_SCHEDULING_BACKEND:-"cron"}
 CONTAINER_SCHEDULING_LOCATION=${CONTAINER_SCHEDULING_LOCATION:-"/assets/cron/"}
 CONTAINER_SKIP_SANITY_CHECK=${CONTAINER_SKIP_SANITY_CHECK:-"FALSE"}
 DEBUG_MODE=${DEBUG_MODE:-"FALSE"}
-SERVICE_NAME=${SERVICE_NAME:-"container"}
+PROCESS_NAME=${PROCESS_NAME:-"container"}
 # shellcheck disable=SC2034
 SCRIPTPATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 || exit ; pwd -P)"
diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
index 4647596..dba41d9 100755
--- a/install/assets/functions/00-container
+++ b/install/assets/functions/00-container
@@ -936,15 +936,15 @@ print_debug() {
         "debug" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[DEBUG] ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[DEBUG] ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdm}[DEBUG]${boff} ** [${PROCESS_NAME}] $1"
                 fi
             fi
         ;;
@@ -952,7 +952,7 @@ print_debug() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" )
-            echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[DEBUG] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -964,15 +964,15 @@ print_error() {
         "debug" | "notice" | "warn" | "error")
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${blr}[ERROR]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${blr}[ERROR]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[ERROR] ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[ERROR] ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${blr}[ERROR]${boff} ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${blr}[ERROR]${boff} ** [${PROCESS_NAME}] $1"
                 fi
             fi
         ;;
@@ -980,7 +980,7 @@ print_error() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" | "warn" | "error")
-            echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[ERROR] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -990,19 +990,19 @@ print_info() {
     output_off
     if [ "${DEBUG_MODE,,}" = "true" ] ; then
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+            echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
         else
-            echo -e "$(log_prefix)${bdg}[INFO]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+            echo -e "$(log_prefix)${bdg}[INFO]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
         fi
     else
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[INFO] ** [${SERVICE_NAME}] $1"
+            echo -e "$(log_prefix)[INFO] ** [${PROCESS_NAME}] $1"
         else
-            echo -e "$(log_prefix)${bdg}[INFO]${boff} ** [${SERVICE_NAME}] $1"
+            echo -e "$(log_prefix)${bdg}[INFO]${boff} ** [${PROCESS_NAME}] $1"
         fi
     fi
 
-    echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+    echo -e "$(log_prefix)[INFO] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     output_on
 }
 
@@ -1012,15 +1012,15 @@ print_notice() {
         "debug" | "notice" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[NOTICE] ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[NOTICE] ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdgy}[NOTICE]${boff} ** [${PROCESS_NAME}] $1"
                 fi
             fi
         ;;
@@ -1028,7 +1028,7 @@ print_notice() {
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" )
-            echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[NOTICE] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
         ;;
     esac
     output_on
@@ -1070,19 +1070,19 @@ print_start() {
 
     if [ "${DEBUG_MODE,,}" = "true" ] ; then
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
 
         else
-            echo -e "$(log_prefix)${bdg}[STARTING]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)${bdg}[STARTING]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
         fi
-        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     else
         if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-            echo -e "$(log_prefix)[STARTING] ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)[STARTING] ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
         else
-            echo -e "$(log_prefix)${bdg}[STARTING]${boff} ** [${SERVICE_NAME}] ${proc_start_wrapper}$1"
+            echo -e "$(log_prefix)${bdg}[STARTING]${boff} ** [${PROCESS_NAME}] ${proc_start_wrapper}$1"
         fi
-        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+        echo -e "$(log_prefix)[STARTING] $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] ${proc_start_wrapper}$1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     fi
     output_on
 }
@@ -1093,22 +1093,22 @@ print_warn() {
         "debug" | "notice" | "warn" )
             if [ "${DEBUG_MODE,,}" = "true" ] ; then
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdb}[WARN]${boff} $SCRIPTPATH/$(basename "$0") ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdb}[WARN]${boff} $SCRIPTPATH/$(basename "$0") ** [${PROCESS_NAME}] $1"
                 fi
             else
                 if [ "${CONTAINER_COLORIZE_OUTPUT,,}" = "false" ] ; then
-                    echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1"
                 else
-                    echo -e "$(log_prefix)${bdb}[WARN]${boff} ** [${SERVICE_NAME}] $1"
+                    echo -e "$(log_prefix)${bdb}[WARN]${boff} ** [${PROCESS_NAME}] $1"
                 fi
             fi
     esac
 
     case "${CONTAINER_LOG_FILE_LEVEL,,}" in
         "debug" | "notice" | "warn" )
-            echo -e "$(log_prefix)[WARN] ** [${SERVICE_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
+            echo -e "$(log_prefix)[WARN] ** [${PROCESS_NAME}] $1" >> "${CONTAINER_LOG_FILE_PATH}"/"${CONTAINER_LOG_FILE_NAME}"
     esac
 
     output_on
diff --git a/install/etc/cont-init.d/00-startup b/install/etc/cont-init.d/00-startup
index 41fb165..b41a860 100755
--- a/install/etc/cont-init.d/00-startup
+++ b/install/etc/cont-init.d/00-startup
@@ -4,7 +4,7 @@ chmod -f -R 0755 /assets/{defaults,functions} > /dev/null 2>&1
 chmod -f -R 0755 /etc/{cont-init.d,cont-finish.d,services.available} > /dev/null 2>&1
 source /assets/functions/00-container
 output_off
-SERVICE_NAME="container-init"
+PROCESS_NAME="container-init"
 showoff
 
 # Clean OS logroate directory
diff --git a/install/etc/cont-init.d/01-timezone b/install/etc/cont-init.d/01-timezone
index 037110f..ea776a6 100755
--- a/install/etc/cont-init.d/01-timezone
+++ b/install/etc/cont-init.d/01-timezone
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-SERVICE_NAME="timezone"
+PROCESS_NAME="timezone"
 
 ### Timezone setup
 if [ -n "${TIMEZONE}" ]; then
diff --git a/install/etc/cont-init.d/02-permissions b/install/etc/cont-init.d/02-permissions
index 86e3ae1..c7e3b9f 100755
--- a/install/etc/cont-init.d/02-permissions
+++ b/install/etc/cont-init.d/02-permissions
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 # shellcheck disable=SC2034
-SERVICE_NAME="permissions"
+PROCESS_NAME="permissions"
 
 ## Legacy
 if var_true "${ENABLE_PERMISSIONS}" ; then
diff --git a/install/etc/cont-init.d/03-monitoring b/install/etc/cont-init.d/03-monitoring
index d2b8147..635da24 100755
--- a/install/etc/cont-init.d/03-monitoring
+++ b/install/etc/cont-init.d/03-monitoring
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service single
-SERVICE_NAME="monitoring"
+PROCESS_NAME="monitoring"
 
 ## Legacy
 if var_false "${ENABLE_ZABBIX}"; then CONTAINER_ENABLE_MONITORING=FALSE ; fi
diff --git a/install/etc/cont-init.d/04-scheduling b/install/etc/cont-init.d/04-scheduling
index 0a5cd97..ef70533 100755
--- a/install/etc/cont-init.d/04-scheduling
+++ b/install/etc/cont-init.d/04-scheduling
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service single
-SERVICE_NAME="scheduling"
+PROCESS_NAME="scheduling"
 
 
 
diff --git a/install/etc/cont-init.d/05-logging b/install/etc/cont-init.d/05-logging
index 3e700e9..1a9a87d 100755
--- a/install/etc/cont-init.d/05-logging
+++ b/install/etc/cont-init.d/05-logging
@@ -3,7 +3,7 @@
 source /assets/functions/00-container
 output_off
 prepare_service
-SERVICE_NAME="logging"
+PROCESS_NAME="logging"
 
 
 if var_true "${CONTAINER_ENABLE_LOGROTATE}" ; then
diff --git a/install/etc/cont-init.d/06-messaging b/install/etc/cont-init.d/06-messaging
index a6158c5..0bd5d1a 100755
--- a/install/etc/cont-init.d/06-messaging
+++ b/install/etc/cont-init.d/06-messaging
@@ -4,7 +4,7 @@ source /assets/functions/00-container
 output_off
 prepare_service single
 # shellcheck disable=SC2034
-SERVICE_NAME="messaging"
+PROCESS_NAME="messaging"
 
 output_off
 
diff --git a/install/etc/cont-init.d/07-firewall b/install/etc/cont-init.d/07-firewall
index cb6fbc8..08c18f8 100755
--- a/install/etc/cont-init.d/07-firewall
+++ b/install/etc/cont-init.d/07-firewall
@@ -4,7 +4,7 @@ source /assets/functions/00-container
 output_off
 prepare_service
 # shellcheck disable=SC2034
-SERVICE_NAME="firewall"
+PROCESS_NAME="firewall"
 
 firewall_command=$(which "${CONTAINER_FIREWALL_BACKEND,,}")
 
diff --git a/install/etc/cont-init.d/99-container b/install/etc/cont-init.d/99-container
index 75243b3..c024d64 100755
--- a/install/etc/cont-init.d/99-container
+++ b/install/etc/cont-init.d/99-container
@@ -3,7 +3,7 @@
 source /assets/defaults/00-container
 source /assets/functions/00-container
 output_off
-SERVICE_NAME="container"
+PROCESS_NAME="container"
 
 if var_false "${CONTAINER_SKIP_SANITY_CHECK}" ; then
 
diff --git a/install/etc/services.available/03-monitoring/run b/install/etc/services.available/03-monitoring/run
index 70517c1..96419d4 100755
--- a/install/etc/services.available/03-monitoring/run
+++ b/install/etc/services.available/03-monitoring/run
@@ -1,7 +1,7 @@
 #!/command/with-contenv bash
 
 source /assets/functions/00-container
-SERVICE_NAME="monitoring"
+PROCESS_NAME="monitoring"
 output_off
 prepare_service defaults single
 check_container_initialized
diff --git a/install/etc/services.available/04-scheduling/run b/install/etc/services.available/04-scheduling/run
index 3a6277e..96e3aeb 100755
--- a/install/etc/services.available/04-scheduling/run
+++ b/install/etc/services.available/04-scheduling/run
@@ -1,7 +1,7 @@
 #!/command/with-contenv bash
 
 source /assets/functions/00-container
-SERVICE_NAME="scheduling"
+PROCESS_NAME="scheduling"
 output_off
 prepare_service
 check_container_initialized
diff --git a/install/etc/services.available/05-logging/run b/install/etc/services.available/05-logging/run
index 24ae6cc..d1743b2 100755
--- a/install/etc/services.available/05-logging/run
+++ b/install/etc/services.available/05-logging/run
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-SERVICE_NAME="logging"
+PROCESS_NAME="logging"
 prepare_service defaults single
 check_container_initialized
 check_service_initialized init
diff --git a/install/etc/services.available/07-firewall/run b/install/etc/services.available/07-firewall/run
index 24305a6..365987f 100755
--- a/install/etc/services.available/07-firewall/run
+++ b/install/etc/services.available/07-firewall/run
@@ -2,7 +2,7 @@
 
 source /assets/functions/00-container
 output_off
-SERVICE_NAME="firewall"
+PROCESS_NAME="firewall"
 prepare_service defaults single
 check_container_initialized
 check_service_initialized init

From feaeec05948e0b6971dcbc825a45d5f61cf01787 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Mon, 5 May 2025 08:51:43 -0700
Subject: [PATCH 9/9] Release 7.10.31 - See CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 Dockerfile   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 565ebf6..495c490 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.31 2025-05-05 <dave at tiredofit dot ca>
+
+   ### Added
+      - S6 Overlay 3.20.3
+
+
 ## 7.10.30 2025-04-26 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/Dockerfile b/Dockerfile
index da958b3..964c12a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ARG YQ_VERSION
 ARG ZABBIX_VERSION
 
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.10"} \
-    S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.2"} \
+    S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.3"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.1"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"7.2.6"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \