From bdad307d98e7ad35304b69928217488603762338 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 30 Dec 2022 15:42:51 +0000 Subject: [PATCH 1/3] Rebase to 3.17, add libbdi-drivers for SQL --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ .github/workflows/external_trigger.yml | 2 +- Dockerfile | 13 +++++++------ Dockerfile.aarch64 | 13 +++++++------ Dockerfile.armhf | 13 +++++++------ Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + .../s6-overlay/s6-rc.d/init-syslog-ng-config/run | 3 ++- root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run | 1 + root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/run | 1 + 12 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 0cd3328..775bcc8 100644 --- a/.github/workflows/external_trigger.yml +++ b/.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.16/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/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 ****" diff --git a/Dockerfile b/Dockerfile index e68d0f5..09a2686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 ARG BUILD_DATE ARG VERSION @@ -8,13 +10,12 @@ LABEL maintainer="TheSpad" RUN \ echo "**** install packages ****" && \ - 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.16/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/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 \ + apk add -U --upgrade --no-cache \ + libbdi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -37,4 +38,4 @@ COPY root/ / EXPOSE 5514/udp 6601/tcp 6514/tcp -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6aea8fa..0baed94 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 ARG BUILD_DATE ARG VERSION @@ -8,13 +10,12 @@ LABEL maintainer="TheSpad" RUN \ echo "**** install packages ****" && \ - 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.16/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/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 \ + apk add -U --upgrade --no-cache \ + libbdi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -37,4 +38,4 @@ COPY root/ / EXPOSE 5514/udp 6601/tcp 6514/tcp -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 724e34f..a90662e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 ARG BUILD_DATE ARG VERSION @@ -8,13 +10,12 @@ LABEL maintainer="TheSpad" RUN \ echo "**** install packages ****" && \ - 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.16/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \ + SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/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 \ + apk add -U --upgrade --no-cache \ + libbdi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -37,4 +38,4 @@ COPY root/ / EXPOSE 5514/udp 6601/tcp 6514/tcp -VOLUME /config \ No newline at end of file +VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 3ba6d57..77f3b46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,8 +25,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng' PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng' DIST_IMAGE = 'alpine' - DIST_TAG = '3.16' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/' + DIST_TAG = '3.17' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/' DIST_REPO_PACKAGES = 'syslog-ng' MULTIARCH = 'true' CI='true' diff --git a/README.md b/README.md index 01bda89..5374d41 100644 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **30.12.22:** - Rebase to Alpine 3.17, add libbdi-drivers for SQL support. * **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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6fd94c1..c22893a 100644 --- a/jenkins-vars.yml +++ b/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.16' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/' + - DIST_TAG = '3.17' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/' - DIST_REPO_PACKAGES = 'syslog-ng' - MULTIARCH = 'true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index 0cf6540..6a2e4ae 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "30.12.22:", desc: "Rebase to Alpine 3.17, add libbdi-drivers for SQL support." } - { 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." } 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 57ec82c..0148d1b 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 @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash #Copy defaults if [[ ! -f "/config/syslog-ng.conf" ]]; then @@ -27,5 +28,5 @@ cat <<-EOF EOF fi -chown -R abc:abc \ +lsiown -R abc:abc \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run b/root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run index 0faa636..25bcb9c 100755 --- a/root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run +++ b/root/etc/s6-overlay/s6-rc.d/log-syslog-ng/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec \ s6-setuidgid abc s6-log n30 s10000000 S30000000 T !"gzip -nq9" /config/log/ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/run b/root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/run index d8795c8..1674698 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-syslog-ng/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec 2>&1 \ s6-setuidgid abc /usr/sbin/syslog-ng -F -f /config/syslog-ng.conf --persist-file /config/syslog-ng.persist --pidfile=/config/syslog-ng.pid --control=/config/syslog-ng.ctl --stderr --no-caps From db96eeec459e40301d6f074e3d90ab4ff3fe60ef Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 30 Dec 2022 15:47:16 +0000 Subject: [PATCH 2/3] Fix package typo --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09a2686..4fd7ee6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN \ && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ - libbdi-drivers \ + libdbi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0baed94..8a7df94 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,7 +15,7 @@ RUN \ && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ - libbdi-drivers \ + libdbi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a90662e..814d74d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,7 +15,7 @@ RUN \ && awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add -U --upgrade --no-cache \ - libbdi-drivers \ + libdbi-drivers \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ From a51a9b7c5789766888b2a90bea8633e7668b3209 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 30 Dec 2022 15:48:21 +0000 Subject: [PATCH 3/3] Fix changelog typo --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5374d41..840d44d 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **30.12.22:** - Rebase to Alpine 3.17, add libbdi-drivers for SQL support. +* **30.12.22:** - Rebase to Alpine 3.17, add libdbi-drivers for SQL support. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index 6a2e4ae..a8efd61 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,7 +47,7 @@ app_setup_block: | # changelog changelogs: - - { date: "30.12.22:", desc: "Rebase to Alpine 3.17, add libbdi-drivers for SQL support." } + - { date: "30.12.22:", desc: "Rebase to Alpine 3.17, add libdbi-drivers for SQL support." } - { 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." }