Merge pull request #12 from linuxserver/sql

Rebase to 3.17, add libdbi-drivers for SQL
2026-03-09 00:04:57 +08:00 · 2022-12-30 22:34:19 +00:00 · 2022-12-30 22:34:19 +00:00 · ea0f1eec0e
commit ea0f1eec0e
parent f018a6bc16 a51a9b7c57
12 changed files with 44 additions and 24 deletions
--- a/.github/workflows/call_invalid_helper.yml
+++ 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
--- 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 ****"
--- a/13
+++ b/13
@ -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 \
+    libdbi-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
+VOLUME /config
--- 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 \
+    libdbi-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
+VOLUME /config
--- 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 \
+    libdbi-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
+VOLUME /config
--- a/4
+++ b/4
@ -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'
--- 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 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.
--- 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'
--- 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 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." }
--- 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
--- 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/
--- 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