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 #21 from linuxserver/3.19

Browse Source 
Rebase to Alpine 3.19
This commit is contained in:
driz 2024-01-31 13:52:52 -05:00 committed by GitHub
commit fccdf732fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 24 additions and 25 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.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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.18/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.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
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."

10
Dockerfile
View File

@ -1,31 +1,31 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
ARG BUILD_DATE
ARG VERSION
ARG SYSLOG_NG_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheSpad"
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.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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 \
grep \
libdbi-drivers \
paho-mqtt-c \
py3-syslog-ng \
syslog-ng==${SYSLOG_NG_VERSION} \
syslog-ng-add-contextual-data \
syslog-ng-amqp \
syslog-ng-graphite \
syslog-ng-http \
syslog-ng-http \
syslog-ng-json \
syslog-ng-map-value-pairs \
syslog-ng-python \
syslog-ng-redis \
syslog-ng-scl \
syslog-ng-sql \

10
Dockerfile.aarch64
View File

@ -1,31 +1,31 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
ARG BUILD_DATE
ARG VERSION
ARG SYSLOG_NG_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheSpad"
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.18/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
SYSLOG_NG_VERSION=$(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://'); \
fi && \
apk add -U --upgrade --no-cache \
grep \
libdbi-drivers \
paho-mqtt-c \
py3-syslog-ng \
syslog-ng==${SYSLOG_NG_VERSION} \
syslog-ng-add-contextual-data \
syslog-ng-amqp \
syslog-ng-graphite \
syslog-ng-http \
syslog-ng-http \
syslog-ng-json \
syslog-ng-map-value-pairs \
syslog-ng-python \
syslog-ng-redis \
syslog-ng-scl \
syslog-ng-sql \

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.18'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
DIST_TAG = '3.19'
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
DIST_REPO_PACKAGES = 'syslog-ng'
MULTIARCH = 'true'
CI='true'

7
README.md
View File

@ -59,7 +59,7 @@ The architectures supported by this image are:
## Application Setup
Edit `/config/syslog-ng.conf` to configure your logging sources and destinations. Note: As the application does not run as root you cannot listen on ports < 1024.
Edit `/config/syslog-ng.conf` to configure your logging sources and destinations.
The application pid, control file, etc. are all kept in /config so when using tools such as `syslog-ng-ctl` you need to specify the path e.g. `syslog-ng-ctl reload -c /config/syslog-ng.ctl`
@ -82,7 +82,7 @@ services:
- PGID=1000
- TZ=Etc/UTC
volumes:
- /path/to/config:/config
- /path/to/syslog-ng/config:/config
- /path/to/log:/var/log #optional
ports:
- 514:5514/udp
@ -102,7 +102,7 @@ docker run -d \
-p 514:5514/udp \
-p 601:6601/tcp \
-p 6514:6514/tcp \
-v /path/to/config:/config \
-v /path/to/syslog-ng/config:/config \
-v /path/to/log:/var/log `#optional` \
--restart unless-stopped \
lscr.io/linuxserver/syslog-ng:latest
@ -284,6 +284,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **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
* **30.12.22:** - Rebase to Alpine 3.17, add libdbi-drivers for SQL support.

4
jenkins-vars.yml
View File

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

10
readme-vars.yml
View File

@ -19,14 +19,11 @@ development_versions: false
# container parameters
common_param_env_vars_enabled: true
param_container_name: "{{ project_name }}"
param_usage_include_env: true
param_env_vars:
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/config", desc: "Stores config and application files" }
- { vol_path: "/config", vol_host_path: "/path/to/syslog-ng/config", desc: "Stores config and application files" }
opt_param_usage_include_vols: true
opt_param_volumes:
opt_param_volumes:
- { vol_path: "/var/log", vol_host_path: "/path/to/log", desc: "Stores logs collected by the syslog-ng service" }
param_usage_include_ports: true
param_ports:
@ -37,7 +34,7 @@ param_ports:
# application setup block
app_setup_block_enabled: true
app_setup_block: |
Edit `/config/syslog-ng.conf` to configure your logging sources and destinations. Note: As the application does not run as root you cannot listen on ports < 1024.
Edit `/config/syslog-ng.conf` to configure your logging sources and destinations.
The application pid, control file, etc. are all kept in /config so when using tools such as `syslog-ng-ctl` you need to specify the path e.g. `syslog-ng-ctl reload -c /config/syslog-ng.ctl`
@ -46,6 +43,7 @@ app_setup_block: |
# changelog
changelogs:
- { 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" }
- { date: "30.12.22:", desc: "Rebase to Alpine 3.17, add libdbi-drivers for SQL support." }