diff --git a/Dockerfile b/Dockerfile index 083837b..63dbdf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN \ && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ + grep \ libdbi-drivers \ paho-mqtt-c \ py3-syslog-ng \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2c59020..3d9dd9d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,6 +15,7 @@ RUN \ && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ + grep \ libdbi-drivers \ paho-mqtt-c \ py3-syslog-ng \ diff --git a/root/defaults/syslog-ng.conf b/root/defaults/syslog-ng.conf index 2a37b6d..48d2f15 100644 --- a/root/defaults/syslog-ng.conf +++ b/root/defaults/syslog-ng.conf @@ -2,7 +2,7 @@ # Default syslog-ng.conf file which collects all local logs into a # single file called /var/log/messages tailored to container usage. -@version: 3.35 +@version: 4.1 @include "scl.conf" source s_local { @@ -27,4 +27,4 @@ log { source(s_network_tcp); source(s_network_udp); destination(d_local); -}; \ No newline at end of file +}; diff --git a/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run b/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run index 0148d1b..c215636 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run @@ -6,8 +6,10 @@ if [[ ! -f "/config/syslog-ng.conf" ]]; then cp -a /defaults/syslog-ng.conf /config/syslog-ng.conf fi -if [[ -f "/config/syslog-ng.conf" ]] && [[ $(grep "@version: 3.29" "/config/syslog-ng.conf") ]]; then - SYSLOG_VERSION=$(syslog-ng --version | grep "Config version" | awk -F ':' '{print $2}' | tr -d '[:space:]') +CONF_VERSION=$(grep -oP "@version: \K(\d+\.\d+)" "/config/syslog-ng.conf") +SYSLOG_VERSION=$(syslog-ng --version | grep "Config version" | awk -F ':' '{print $2}' | tr -d '[:space:]') + +if [[ -f "/config/syslog-ng.conf" ]] && (( $(bc -l <<< "${CONF_VERSION} < ${SYSLOG_VERSION}") )); then cat <<-EOF ******************************************************** ********************************************************