@@ -299,7 +299,7 @@ pipeline {
299
299
echo "Jenkinsfile is up to date."
300
300
fi
301
301
echo "Starting Stage 2 - Delete old templates"
302
- OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf "
302
+ OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
303
303
for i in ${OLD_TEMPLATES}; do
304
304
if [[ -f "${i}" ]]; then
305
305
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -529,6 +529,7 @@ pipeline {
529
529
--label \" org.opencontainers.image.title=Syslog-ng\" \
530
530
--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.\" \
531
531
--no-cache --pull -t ${ IMAGE} :${ META_TAG} --platform=linux/amd64 \
532
+ --provenance=false --sbom=false \
532
533
--build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
533
534
}
534
535
}
@@ -560,6 +561,7 @@ pipeline {
560
561
--label \" org.opencontainers.image.title=Syslog-ng\" \
561
562
--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.\" \
562
563
--no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} --platform=linux/amd64 \
564
+ --provenance=false --sbom=false \
563
565
--build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
564
566
}
565
567
}
@@ -588,6 +590,7 @@ pipeline {
588
590
--label \" org.opencontainers.image.title=Syslog-ng\" \
589
591
--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.\" \
590
592
--no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} --platform=linux/arm64 \
593
+ --provenance=false --sbom=false \
591
594
--build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
592
595
sh " docker tag ${ IMAGE} :arm64v8-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
593
596
retry(5 ) {
@@ -711,7 +714,7 @@ pipeline {
711
714
--shm-size=1gb \
712
715
-v /var/run/docker.sock:/var/run/docker.sock \
713
716
-e IMAGE=\" ${IMAGE}\" \
714
- -e DELAY_START =\" ${CI_DELAY}\" \
717
+ -e DOCKER_LOGS_TIMEOUT =\" ${CI_DELAY}\" \
715
718
-e TAGS=\" ${CI_TAGS}\" \
716
719
-e META_TAG=\" ${META_TAG}\" \
717
720
-e PORT=\" ${CI_PORT}\" \
@@ -819,35 +822,13 @@ pipeline {
819
822
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
820
823
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
821
824
fi
822
- docker manifest push --purge ${MANIFESTIMAGE}:latest || :
823
- docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
824
- docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
825
- docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
826
- docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
827
- docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
828
- docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
829
- docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
830
- docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
831
- if [ -n "${SEMVER}" ]; then
832
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
833
- docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
834
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
835
- fi
836
- token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
837
- digest=$(curl -s \
838
- --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
839
- --header "Authorization: Bearer ${token}" \
840
- "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
841
- if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
842
- docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
843
- docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
844
- docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
845
- fi
846
- docker manifest push --purge ${MANIFESTIMAGE}:latest
847
- docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
848
- docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
825
+ done
826
+ for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
827
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
828
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
829
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
849
830
if [ -n "${SEMVER}" ]; then
850
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
831
+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
851
832
fi
852
833
done
853
834
'''
0 commit comments