2025.12.1beta

Author: tiredofit

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2025.12.1beta 2025-12-20 <code at nfrastack dot com>
+
+  ## Changed
+   - Package cleanup not removing all symbolic links
+   - Binary Check for Logshipping not working due to hyphens
+   - Fluent-bit module not executing properly
+
 ## 2025.12.0 2025-12-19 <code at nfrastack dot com>
 
    - Initial Tagged release

Containerfile

@@ -20,7 +20,7 @@ LABEL \
 
 ARG     \
         IMAGE_BASE_MODULES="+cron,+logrotate,+msmtp,+s6overlay," \
-        IMAGE_MODULES \
+        IMAGE_MODULES="+fluentbit" \
         IMAGE_NAME \
         IMAGE_BASE_VERSION \
         IMAGE_BASE_REPO_URL \

README.md

@@ -164,20 +164,20 @@ Change time and date and settings with these environment variables
 
 Only valid if appropriate module has been installed within the image. See [MODULES documentation](/rootfs/container/base/modules) for more information to see other configurable options.
 
-| Parameter                       | Description                                  | Default      | Advanced |
-| ------------------------------- | -------------------------------------------- | ------------ | -------- |
-| `CONTAINER_ENABLE_METRICS`      | Enable Metrics                               | `TRUE`       | x        |
-| `CONTAINER_ENABLE_MONITORING`   | Enable Monitoring of applications or metrics | `TRUE`       |          |
-| `CONTAINR_MONITORING_BACKEND`   | What monitoring agent to use `zabbix`        | `zabbix`     |          |
-| `CONTAINER_ENABLE_MESSAGING`    | Enable Messaging services like SMTP          | `TRUE`       |          |
-| `CONTAINER_MESSAGING_BACKEND`   | Messaging Backend - presently only `msmtp`   | `msmtp`      |          |
-| `CONTAINER_ENABLE_SCHEDULING`   | Enable Scheduled Tasks                       | `TRUE`       |          |
-| `CONTAINR_SCHEDULING_BACKEND`   | What scheduling tool to use `cron`           | `cron`       |          |
-| `CONTAINER_ENABLE_LOGROTATE`    | Enable Logrotate (if scheduling enabled)     | `TRUE`       |          |
-| `CONTAINER_ENABLE_LOGSHIPPING`  | Enable Log Shipping                          | `FALSE`      |          |
-| `CONTAINER_LOGSHIPPING_BACKEND` | Log shipping backend `fluent-bit`            | `fluent-bit` |          |
-| `CONTAINER_ENABLE_FIREWALL`     | Enable Firewall Functionality                | `FALSE`      |          |
-| `CONTAINER_FIREWALL_BACKEND`    | What Firewall backend to use `iptables`      | `iptables`   |          |
+| Parameter                       | Description                                  | Default     | Advanced |
+| ------------------------------- | -------------------------------------------- | ----------- | -------- |
+| `CONTAINER_ENABLE_METRICS`      | Enable Metrics                               | `TRUE`      | x        |
+| `CONTAINER_ENABLE_MONITORING`   | Enable Monitoring of applications or metrics | `TRUE`      |          |
+| `CONTAINR_MONITORING_BACKEND`   | What monitoring agent to use `zabbix`        | `zabbix`    |          |
+| `CONTAINER_ENABLE_MESSAGING`    | Enable Messaging services like SMTP          | `TRUE`      |          |
+| `CONTAINER_MESSAGING_BACKEND`   | Messaging Backend - presently only `msmtp`   | `msmtp`     |          |
+| `CONTAINER_ENABLE_SCHEDULING`   | Enable Scheduled Tasks                       | `TRUE`      |          |
+| `CONTAINR_SCHEDULING_BACKEND`   | What scheduling tool to use `cron`           | `cron`      |          |
+| `CONTAINER_ENABLE_LOGROTATE`    | Enable Logrotate (if scheduling enabled)     | `TRUE`      |          |
+| `CONTAINER_ENABLE_LOGSHIPPING`  | Enable Log Shipping                          | `FALSE`     |          |
+| `CONTAINER_LOGSHIPPING_BACKEND` | Log shipping backend `fluentbit`             | `fluentbit` |          |
+| `CONTAINER_ENABLE_FIREWALL`     | Enable Firewall Functionality                | `FALSE`     |          |
+| `CONTAINER_FIREWALL_BACKEND`    | What Firewall backend to use `iptables`      | `iptables`  |          |
 
 #### Networking Options
 ##### Firewall Options

rootfs/container/base/defaults/container

@@ -15,7 +15,7 @@ CONTAINER_ENABLE_SCHEDULING=${CONTAINER_ENABLE_SCHEDULING:-"FALSE"}
 CONTAINER_ENABLE_SECRETS=${CONTAINER_ENABLE_SECRETS:-"FALSE"}
 CONTAINER_ENABLE_VPN=${CONTAINER_ENABLE_VPN:-"FALSE"}
 CONTAINER_FIREWALL_BACKEND=${CONTAINER_FIREWALL_BACKEND:-"iptables"}
-CONTAINER_LOGSHIPPING_BACKEND=${CONTAINER_LOGSHIPPING_BACKEND:-"fluent-bit"}
+CONTAINER_LOGSHIPPING_BACKEND=${CONTAINER_LOGSHIPPING_BACKEND:-"fluentbit"}
 CONTAINER_LOG_LEVEL=${CONTAINER_LOG_LEVEL:-"NOTICE"}
 CONTAINER_MESSAGING_BACKEND=${CONTAINER_MESSAGING_BACKEND:-"msmtp"}
 CONTAINER_MONITORING_BACKEND=${CONTAINER_MONITORING_BACKEND:-"zabbix"}

rootfs/container/base/functions/container/available/packages

@@ -60,16 +60,6 @@ package() {
                     ;;
                 esac
 
-                for symlink in \
-                                    /usr/local/bin/go \
-                                    /usr/local/bin/godoc \
-                                    /usr/local/bin/gfmt \
-                                ; do \
-                    if [ -L "${symlink}" ] && ! [ -e "${symlink}" ]; then
-                        rm -f "${symlink}"
-                    fi
-                done
-
                 rm -rf \
                         /build-assets \
                         /etc/logrotate.d/{*,.??*} \
@@ -81,6 +71,16 @@ package() {
                         /usr/src/{*,.??*} \
                         /var/log/{*,.??*} \
                         /var/tmp/{*,.??*}
+
+                for symlink in \
+                                    /usr/local/bin/go \
+                                    /usr/local/bin/godoc \
+                                    /usr/local/bin/gfmt \
+                                ; do \
+                    if [ -L "${symlink}" ] && ! [ -e "${symlink}" ]; then
+                        rm -f "${symlink}"
+                    fi
+                done
             ;;
         esac
     }

rootfs/container/base/init/init.d/05-logging

@@ -15,7 +15,7 @@ fi
 
 if var_true "${CONTAINER_ENABLE_LOGSHIPPING}" ; then
     if ! binary_exists $(var_value ${CONTAINER_LOGSHIPPING_BACKEND^^}_BINARY); then
-            print_debug "Disabling Log Shipping Backend ${CONTAINER_LOGSHIPPIPNG_BACKEND} - Binary '$(echo ${CONTAINER_LOGSHIPPING_BACKEND^^}_BINARY)' not found"
+            print_debug "Disabling Log Shipping Backend ${CONTAINER_LOGSHIPPIPNG_BACKEND^^} - Binary '$(echo ${CONTAINER_LOGSHIPPING_BACKEND^^}_BINARY)' not found"
             service_stop "$(basename "$0")"
     else
         call nfra_configure_logging_${CONTAINER_LOGSHIPPING_BACKEND/-/}_init

rootfs/container/base/modules/fluentbit/module

@@ -230,6 +230,7 @@ install() {
         mkdir -p /etc/fluent-bit/parsers.d
         mkdir -p /etc/fluent-bit/conf.d
         strip /usr/bin/fluent-bit
+        ln -s /usr/bin/fluent-bit /usr/local/bin/fluentbit
 
         if [ -d "$(dirname "$0")"/rootfs ]; then
             cp -aR "$(dirname "$0")"/rootfs/* /

rootfs/container/base/modules/fluentbit/rootfs/container/base/functions/logging/fluentbit

@@ -183,7 +183,7 @@ EOF
                     unset "${!LOGSHIP_@}"
 
                     ## Defaults
-                    for default in $(find find /container/base/defaults/* /container/defaults/* /override/base/defaults* /override/defaults/* -type f ! -name *.enc* -print 2>/dev/null); do
+                    for default in $(find find /container/base/defaults/* /container/defaults/* /override/base/defaults* /override/defaults/* -type f ! -name *.enc* ! -name .*.age ! -name .nfrastack -print 2>/dev/null); do
                         # shellcheck source=/container/defaults/
                         source "${default}"
                         logshipenv=$(mktemp)
@@ -477,5 +477,5 @@ EOF
     print_start "[logship] Starting fluent-bit ${FLUENTBIT_VERSION}"
     output_on
     liftoff
-    silent exec ${FLUENTBIT_BINARY} -c /etc/fluent-bit/fluent-bit.conf
+    exec ${FLUENTBIT_BINARY} -c /etc/fluent-bit/fluent-bit.conf >/dev/null 2>&1
 }