Skip to content

Commit 9d54102

Browse files
committed
Rebase to Alpine 3.15
1 parent 28f64df commit 9d54102

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

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.14
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
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.14/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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.14
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
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.14/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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.14
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
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.14/main/armhf/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/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 \

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repo_vars:
1616
- PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
1717
- DIST_IMAGE = 'alpine'
1818
- DIST_TAG = '3.14'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/main/'
19+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.15/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,5 +45,6 @@ app_setup_block: |
4545
4646
# changelog
4747
changelogs:
48+
- { date: "18.12.21:", desc: "Rebase to Alpine 3.15." }
4849
- { date: "01.07.21:", desc: "Rebase to Alpine 3.14." }
4950
- { date: "26.05.21:", desc: "Initial release." }

0 commit comments

Comments
 (0)