Skip to content

Commit 7251993

Browse files
thespadthespad
authored
Merge pull request #8 from linuxserver/s6v3-main
2 parents 8a69e4e + 5c165d0 commit 7251993

File tree

27 files changed

+53
-22
lines changed

27 files changed

+53
-22
lines changed

‎.github/workflows/external_trigger.yml

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

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.16
22

33
ARG BUILD_DATE
44
ARG VERSION
@@ -11,7 +11,7 @@ RUN \
1111
apk add -U --upgrade --no-cache \
1212
curl && \
1313
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
14-
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1515
&& awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1616
fi && \
1717
apk add -U --upgrade --no-cache \

‎Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
22

33
ARG BUILD_DATE
44
ARG VERSION
@@ -11,7 +11,7 @@ RUN \
1111
apk add -U --upgrade --no-cache \
1212
curl && \
1313
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
14-
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
1515
&& awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1616
fi && \
1717
apk add -U --upgrade --no-cache \

‎Dockerfile.armhf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
22

33
ARG BUILD_DATE
44
ARG VERSION
@@ -11,7 +11,7 @@ RUN \
1111
apk add -U --upgrade --no-cache \
1212
curl && \
1313
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
14-
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
1515
&& awk '/^P:syslog-ng$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
1616
fi && \
1717
apk add -U --upgrade --no-cache \

‎Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pipeline {
2525
DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
2626
PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
2727
DIST_IMAGE = 'alpine'
28-
DIST_TAG = '3.15'
29-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/main/'
28+
DIST_TAG = '3.16'
29+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/'
3030
DIST_REPO_PACKAGES = 'syslog-ng'
3131
MULTIARCH = 'true'
3232
CI='true'

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
232232

233233
## Versions
234234

235+
* **01.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
235236
* **18.12.21:** - Rebase to Alpine 3.15.
236237
* **01.07.21:** - Rebase to Alpine 3.14.
237238
* **26.05.21:** - Initial release.

‎jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ repo_vars:
1515
- DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
1616
- PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
1717
- DIST_IMAGE = 'alpine'
18-
- DIST_TAG = '3.15'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/main/'
18+
- DIST_TAG = '3.16'
19+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/main/'
2020
- DIST_REPO_PACKAGES = 'syslog-ng'
2121
- MULTIARCH = 'true'
2222
- CI='true'

‎readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ app_setup_block: |
4545
4646
# changelog
4747
changelogs:
48+
- { date: "01.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
4849
- { date: "18.12.21:", desc: "Rebase to Alpine 3.15." }
4950
- { date: "01.07.21:", desc: "Rebase to Alpine 3.14." }
5051
- { date: "26.05.21:", desc: "Initial release." }

‎root/defaults/syslog-ng.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Default syslog-ng.conf file which collects all local logs into a
33
# single file called /var/log/messages tailored to container usage.
44

5-
@version: 3.29
5+
@version: 3.35
66
@include "scl.conf"
77

88
source s_local {

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)