Merge pull request #8 from linuxserver/s6v3-main

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SYSLOG_NG_MAIN\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"syslog-ng"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 ARG BUILD_DATE
 ARG VERSION
@@ -11,7 +11,7 @@ RUN \
   apk add -U --upgrade --no-cache  \
     curl && \
   if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
-    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache  \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 ARG BUILD_DATE
 ARG VERSION
@@ -11,7 +11,7 @@ RUN \
   apk add -U --upgrade --no-cache  \
     curl && \
   if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
-    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache  \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 ARG BUILD_DATE
 ARG VERSION
@@ -11,7 +11,7 @@ RUN \
   apk add -U --upgrade --no-cache  \
     curl && \  
   if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
-    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \  
   apk add -U --upgrade --no-cache  \

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
     PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.15'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/main/'
+    DIST_TAG = '3.16'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/'
     DIST_REPO_PACKAGES = 'syslog-ng'
     MULTIARCH = 'true'
     CI='true'

README.md

@@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
 * **18.12.21:** - Rebase to Alpine 3.15.
 * **01.07.21:** - Rebase to Alpine 3.14.
 * **26.05.21:** - Initial release.

jenkins-vars.yml

@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.15'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/main/'
+  - DIST_TAG = '3.16'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/'
   - DIST_REPO_PACKAGES = 'syslog-ng'
   - MULTIARCH = 'true'
   - CI='true'

readme-vars.yml

@@ -45,6 +45,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "01.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
   - { date: "18.12.21:", desc: "Rebase to Alpine 3.15." }
   - { date: "01.07.21:", desc: "Rebase to Alpine 3.14." }
   - { date: "26.05.21:", desc: "Initial release." }

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.29
+@version: 3.35
 @include "scl.conf"
 
 source s_local {

root/etc/cont-init.d/50-config

@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-#Copy defaults
-if [ ! -f "/config/syslog-ng.conf" ]; then
-    cp -a /defaults/syslog-ng.conf /config/syslog-ng.conf
-fi
-
-chown -R abc:abc \
-    /config

root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run

@@ -0,0 +1,31 @@
+#!/usr/bin/with-contenv bash
+
+#Copy defaults
+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:]')
+cat <<-EOF
+********************************************************
+********************************************************
+*                                                      *
+*                         !!!!                         *
+*    WARNING: Configuration file format is too old,    *
+*     syslog-ng is running in compatibility mode.      *
+*                                                      *
+*   To upgrade the configuration, please review any    *
+*    warnings about incompatible changes in the log.   *
+*                                                      *
+*   Once completed change the @version header at the   * 
+*       top of the configuration file to "${SYSLOG_VERSION}"        *
+*                                                      *
+*                                                      *
+********************************************************
+********************************************************
+EOF
+fi
+
+chown -R abc:abc \
+    /config

root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-syslog-ng-config/run

root/etc/s6-overlay/s6-rc.d/log-syslog-ng/consumer-for

@@ -0,0 +1 @@
+svc-syslog-ng

root/etc/s6-overlay/s6-rc.d/log-syslog-ng/pipeline-name

@@ -0,0 +1 @@
+pipeline-syslog-ng

root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run

@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bash
 
 exec \
-    s6-setuidgid abc s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/log/
+    s6-setuidgid abc s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/log/

root/etc/s6-overlay/s6-rc.d/log-syslog-ng/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/producer-for

@@ -0,0 +1 @@
+log-syslog-ng

root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/type

@@ -0,0 +1 @@
+longrun