Skip to content

Commit 9161549

Browse files
thespadthespad
authored
Merge pull request #17 from linuxserver/3.18
2 parents dc2d70f + 6850d26 commit 9161549

File tree

13 files changed

+35
-120
lines changed

13 files changed

+35
-120
lines changed

‎.github/ISSUE_TEMPLATE/issue.bug.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ body:
5353
options:
5454
- x86-64
5555
- arm64
56-
- armhf
5756
validations:
5857
required: true
5958
- type: textarea

‎.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SYSLOG_NG_MAIN\". ****"
2121
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
2222
echo "**** Retrieving external version ****"
23-
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
23+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2424
&& awk '/^P:'"syslog-ng"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
2525
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2626
echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
7474
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
7575
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
7676
exit 0
77-
elif [[ $(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://') != "${EXT_RELEASE}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/armv7/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"syslog-ng"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
77+
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
7878
echo "**** New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting ****"
7979
echo "New version ${EXT_RELEASE} found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
8080
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."

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -11,7 +11,7 @@ LABEL maintainer="TheSpad"
1111
RUN \
1212
echo "**** install packages ****" && \
1313
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
14-
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/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,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -11,7 +11,7 @@ LABEL maintainer="TheSpad"
1111
RUN \
1212
echo "**** install packages ****" && \
1313
if [ -z ${SYSLOG_NG_VERSION+x} ]; then \
14-
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp \
14+
SYSLOG_NG_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/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: 0 additions & 42 deletions
This file was deleted.

‎Jenkinsfile

Lines changed: 19 additions & 63 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.17'
29-
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
28+
DIST_TAG = '3.18'
29+
DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
3030
DIST_REPO_PACKAGES = 'syslog-ng'
3131
MULTIARCH = 'true'
3232
CI='true'
@@ -167,7 +167,7 @@ pipeline {
167167
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
168168
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
169169
if (env.MULTIARCH == 'true') {
170-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
170+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
171171
} else {
172172
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
173173
}
@@ -190,7 +190,7 @@ pipeline {
190190
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
191191
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
192192
if (env.MULTIARCH == 'true') {
193-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
193+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
194194
} else {
195195
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
196196
}
@@ -213,7 +213,7 @@ pipeline {
213213
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
214214
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
215215
if (env.MULTIARCH == 'true') {
216-
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
216+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
217217
} else {
218218
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
219219
}
@@ -519,44 +519,6 @@ pipeline {
519519
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
520520
}
521521
}
522-
stage('Build ARMHF') {
523-
agent {
524-
label 'ARMHF'
525-
}
526-
steps {
527-
echo "Running on node: ${NODE_NAME}"
528-
echo 'Logging into Github'
529-
sh '''#! /bin/bash
530-
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
531-
'''
532-
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
533-
sh "docker buildx build \
534-
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
535-
--label \"org.opencontainers.image.authors=linuxserver.io\" \
536-
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-syslog-ng/packages\" \
537-
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-syslog-ng\" \
538-
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-syslog-ng\" \
539-
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
540-
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
541-
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
542-
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
543-
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
544-
--label \"org.opencontainers.image.title=Syslog-ng\" \
545-
--label \"org.opencontainers.image.description=[syslog-ng](https://www.syslog-ng.com/products/open-source-log-management/) allows you to flexibly collect, parse, classify, rewrite and correlate logs from across your infrastructure and store or route them to log analysis tools.\" \
546-
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
547-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
548-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
549-
retry(5) {
550-
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
551-
}
552-
sh '''#! /bin/bash
553-
containers=$(docker ps -aq)
554-
if [[ -n "${containers}" ]]; then
555-
docker stop ${containers}
556-
fi
557-
docker system prune -af --volumes || : '''
558-
}
559-
}
560522
stage('Build ARM64') {
561523
agent {
562524
label 'ARM64'
@@ -697,9 +659,7 @@ pipeline {
697659
set -e
698660
docker pull ghcr.io/linuxserver/ci:latest
699661
if [ "${MULTIARCH}" == "true" ]; then
700-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
701662
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
702-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
703663
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
704664
fi
705665
docker run --rm \
@@ -802,58 +762,54 @@ pipeline {
802762
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
803763
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
804764
if [ "${CI}" == "false" ]; then
805-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
806-
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
807765
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
808766
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
809767
fi
810768
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
811769
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
812770
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
813771
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
814-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
815-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
816-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
817772
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
818773
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
819774
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
820775
if [ -n "${SEMVER}" ]; then
821776
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
822-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
823777
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
824778
fi
825779
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
826780
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
827781
docker push ${MANIFESTIMAGE}:amd64-latest
828-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
829-
docker push ${MANIFESTIMAGE}:arm32v7-latest
830-
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
831782
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
832783
docker push ${MANIFESTIMAGE}:arm64v8-latest
833784
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
834785
if [ -n "${SEMVER}" ]; then
835786
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
836-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
837787
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
838788
fi
839789
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
840-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
841-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
790+
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
842791
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
843792
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
844-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
845-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
793+
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
846794
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
847795
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
848-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
849-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
796+
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
850797
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
851798
if [ -n "${SEMVER}" ]; then
852799
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
853-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
854-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
800+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
855801
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
856802
fi
803+
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
804+
digest=$(curl -s \
805+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
806+
--header "Authorization: Bearer ${token}" \
807+
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
808+
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
809+
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
810+
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
811+
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
812+
fi
857813
docker manifest push --purge ${MANIFESTIMAGE}:latest
858814
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
859815
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The architectures supported by this image are:
5656
| :----: | :----: | ---- |
5757
| x86-64 | ✅ | amd64-\<version tag\> |
5858
| arm64 | ✅ | arm64v8-\<version tag\> |
59-
| armhf | ✅ | arm32v7-\<version tag\> |
59+
| armhf | ❌ | |
6060

6161
## Application Setup
6262

@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
235235

236236
## Versions
237237

238+
* **11.06.23:** - Rebase to Alpine 3.18, deprecate armhf.
238239
* **10.01.23:** - Add paho-mqtt-c library as required by the syslog-ng documentation
239240
* **30.12.22:** - Rebase to Alpine 3.17, add libdbi-drivers for SQL support.
240241
* **01.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.

‎jenkins-vars.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ external_type: alpine_repo
66
release_type: stable
77
release_tag: latest
88
ls_branch: main
9+
build_armhf: false
910
repo_vars:
1011
- BUILD_VERSION_ARG = 'SYSLOG_NG_VERSION'
1112
- LS_USER = 'linuxserver'
@@ -15,8 +16,8 @@ repo_vars:
1516
- DEV_DOCKERHUB_IMAGE = 'lsiodev/syslog-ng'
1617
- PR_DOCKERHUB_IMAGE = 'lspipepr/syslog-ng'
1718
- DIST_IMAGE = 'alpine'
18-
- DIST_TAG = '3.17'
19-
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
19+
- DIST_TAG = '3.18'
20+
- DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
2021
- DIST_REPO_PACKAGES = 'syslog-ng'
2122
- MULTIARCH = 'true'
2223
- CI='true'

0 commit comments

Comments
 (0)