LAB-linuxserver/docker-syslog-ng
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-syslog-ng.git synced 2026-03-09 00:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from linuxserver/3.20

Browse Source 
Rebase to 3.20
This commit is contained in:
Adam 2024-05-24 20:19:46 +01:00 committed by GitHub
commit 61fa1a411e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/external_trigger.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SYSLOG_NG_MAIN\". ****"
echo "External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SYSLOG_NG_MAIN\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/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 ****"
@ -74,7 +74,7 @@ jobs:
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
exit 0
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"syslog-ng"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"syslog-ng"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
FAILURE_REASON="New version ${EXT_RELEASE} for syslog-ng tag latest is detected, however not all arch repos are updated yet. Will try again later."

5
Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
ARG BUILD_DATE
ARG VERSION
@ -11,7 +11,7 @@ LABEL maintainer="thespad"
RUN \
echo "**** install packages ****" && \
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/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 \
@ -33,6 +33,7 @@ RUN \
syslog-ng-stomp \
syslog-ng-tags-parser \
syslog-ng-xml && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
rm -rf \
/tmp/*

5
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
ARG BUILD_DATE
ARG VERSION
@ -11,7 +11,7 @@ LABEL maintainer="thespad"
RUN \
echo "**** install packages ****" && \
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/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 \
@ -33,6 +33,7 @@ RUN \
syslog-ng-stomp \
syslog-ng-tags-parser \
syslog-ng-xml && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
rm -rf \
/tmp/*

4
Jenkinsfile vendored
View File

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

1
README.md
View File

@ -284,6 +284,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **24.05.24:** - Rebase to Alpine 3.20.
* **31.01.24:** - Rebase to Alpine 3.19.
* **11.06.23:** - Rebase to Alpine 3.18, deprecate armhf.
* **10.01.23:** - Add paho-mqtt-c library as required by the syslog-ng documentation

5
jenkins-vars.yml
View File

@ -6,7 +6,6 @@ external_type: alpine_repo
release_type: stable
release_tag: latest
ls_branch: main
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'SYSLOG_NG_VERSION'
- LS_USER = 'linuxserver'
@ -16,8 +15,8 @@ repo_vars:
- DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
- PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
- DIST_IMAGE = 'alpine'
- DIST_TAG = '3.19'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
- DIST_TAG = '3.20'
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
- DIST_REPO_PACKAGES = 'syslog-ng'
- MULTIARCH = 'true'
- CI='true'

1
readme-vars.yml
View File

@ -43,6 +43,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "24.05.24:", desc: "Rebase to Alpine 3.20." }
- { date: "31.01.24:", desc: "Rebase to Alpine 3.19." }
- { date: "11.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "10.01.23:", desc: "Add paho-mqtt-c library as required by the syslog-ng documentation" }