From 29c01914847c08afa57855b5a81a5fc5ed16e41a Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 16 Jul 2023 23:21:55 +0200 Subject: [PATCH] Update syslogng to 4.1.1-r2 --- Dockerfile | 5 ++++- rootfs/etc/syslog-ng/syslog-ng.conf | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b257db04..e360c9a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ ARG LIBRENMS_VERSION="23.11.0" ARG WEATHERMAP_PLUGIN_COMMIT="0b2ff643b65ee4948e4f74bb5cad5babdaddef27" ARG ALPINE_VERSION="3.18" +ARG SYSLOGNG_VERSION="4.1.1-r2" FROM crazymax/yasu:latest AS yasu FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 @@ -68,7 +69,6 @@ RUN apk --update --no-cache add \ runit \ sed \ shadow \ - syslog-ng=3.38.1-r0 \ ttf-dejavu \ tzdata \ util-linux \ @@ -96,6 +96,9 @@ RUN apk --update --no-cache add \ && setcap cap_net_raw+ep /usr/lib/monitoring-plugins/check_icmp \ && setcap cap_net_raw+ep /usr/lib/monitoring-plugins/check_ping +ARG SYSLOGNG_VERSION +RUN apk --update --no-cache add syslog-ng=${SYSLOGNG_VERSION} + ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \ LIBRENMS_PATH="/opt/librenms" \ LIBRENMS_DOCKER="1" \ diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf index e7009ec9..b5adbf51 100644 --- a/rootfs/etc/syslog-ng/syslog-ng.conf +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:3.38 +@version:4.1 options { chain_hostnames(off);