From 95337edcd5f38903a16fa86da7da405f7b40ca02 Mon Sep 17 00:00:00 2001
From: Ilya <138466237+ikheifets-splunk@users.noreply.github.com>
Date: Thu, 25 Apr 2024 23:58:26 +0200
Subject: [PATCH] fix: Bump syslog-ng version on 4.7.1 (#2407)

Co-authored-by: Rahul Jha <90039710+rjha-splunk@users.noreply.github.com>
---
 package/Dockerfile                    | 7 +++----
 package/Dockerfile.lite               | 7 +++----
 package/etc/syslog-ng.conf            | 2 +-
 package/lite/etc/syslog-ng.conf.jinja | 2 +-
 tests/Dockerfile.nc                   | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package/Dockerfile b/package/Dockerfile
index 35c6523201..85f60d238a 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -16,7 +16,7 @@
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.7.1
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 
@@ -40,14 +40,13 @@ RUN apk add -U --upgrade --no-cache \
       wget \
       cargo \
       ca-certificates \
+      poetry \
     && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.6 sh \
     && groupadd --gid 1024 syslog \
     && useradd -M -g 1024 -u 1024 syslog \
     && usermod -L syslog \
     && touch /var/log/syslog-ng.out /var/log/syslog-ng.err \
-    && chmod 755 /var/log/syslog-ng.* \
-    && pip3 --no-cache-dir install poetry
-
+    && chmod 755 /var/log/syslog-ng.*
 
 EXPOSE 514
 EXPOSE 601/tcp
diff --git a/package/Dockerfile.lite b/package/Dockerfile.lite
index b47386e808..538ad6a779 100644
--- a/package/Dockerfile.lite
+++ b/package/Dockerfile.lite
@@ -16,7 +16,7 @@
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.7.1
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 
@@ -40,14 +40,13 @@ RUN apk add -U --upgrade --no-cache \
       wget \
       cargo \
       ca-certificates \
+      poetry \
     && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.6 sh \
     && groupadd --gid 1024 syslog \
     && useradd -M -g 1024 -u 1024 syslog \
     && usermod -L syslog \
     && touch /var/log/syslog-ng.out /var/log/syslog-ng.err \
-    && chmod 755 /var/log/syslog-ng.* \
-    && pip3 --no-cache-dir install poetry
-
+    && chmod 755 /var/log/syslog-ng.*
 
 EXPOSE 514
 EXPOSE 601/tcp
diff --git a/package/etc/syslog-ng.conf b/package/etc/syslog-ng.conf
index 15ff938a64..a71ff4ee14 100644
--- a/package/etc/syslog-ng.conf
+++ b/package/etc/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version:4.6
+@version:4.7
 
 
 # syslog-ng configuration file.
diff --git a/package/lite/etc/syslog-ng.conf.jinja b/package/lite/etc/syslog-ng.conf.jinja
index 47e037a705..9921bb2ea8 100644
--- a/package/lite/etc/syslog-ng.conf.jinja
+++ b/package/lite/etc/syslog-ng.conf.jinja
@@ -1,4 +1,4 @@
-@version:4.6
+@version:4.7
 
 
 # syslog-ng configuration file.
diff --git a/tests/Dockerfile.nc b/tests/Dockerfile.nc
index 405e8650fa..8cd4cf8aae 100644
--- a/tests/Dockerfile.nc
+++ b/tests/Dockerfile.nc
@@ -1,4 +1,4 @@
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.7.1
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 RUN apk add -U netcat-openbsd
\ No newline at end of file