Skip to content

Commit 0fec1e2

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent a1efdbf commit 0fec1e2

1 file changed

Lines changed: 11 additions & 30 deletions

File tree

‎Jenkinsfile‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ pipeline {
295295
echo "Jenkinsfile is up to date."
296296
fi
297297
echo "Starting Stage 2 - Delete old templates"
298-
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"
298+
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"
299299
for i in ${OLD_TEMPLATES}; do
300300
if [[ -f "${i}" ]]; then
301301
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -525,6 +525,7 @@ pipeline {
525525
--label \"org.opencontainers.image.title=Nextcloud\" \
526526
--label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are. Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home. \" \
527527
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
528+
--provenance=false --sbom=false \
528529
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
529530
}
530531
}
@@ -556,6 +557,7 @@ pipeline {
556557
--label \"org.opencontainers.image.title=Nextcloud\" \
557558
--label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are. Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home. \" \
558559
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
560+
--provenance=false --sbom=false \
559561
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
560562
}
561563
}
@@ -584,6 +586,7 @@ pipeline {
584586
--label \"org.opencontainers.image.title=Nextcloud\" \
585587
--label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are. Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home. \" \
586588
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
589+
--provenance=false --sbom=false \
587590
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
588591
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
589592
retry(5) {
@@ -707,7 +710,7 @@ pipeline {
707710
--shm-size=1gb \
708711
-v /var/run/docker.sock:/var/run/docker.sock \
709712
-e IMAGE=\"${IMAGE}\" \
710-
-e DELAY_START=\"${CI_DELAY}\" \
713+
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
711714
-e TAGS=\"${CI_TAGS}\" \
712715
-e META_TAG=\"${META_TAG}\" \
713716
-e PORT=\"${CI_PORT}\" \
@@ -815,35 +818,13 @@ pipeline {
815818
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
816819
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
817820
fi
818-
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
819-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
820-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
821-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
822-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
823-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
824-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
825-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
826-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
827-
if [ -n "${SEMVER}" ]; then
828-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
829-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
830-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
831-
fi
832-
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
833-
digest=$(curl -s \
834-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
835-
--header "Authorization: Bearer ${token}" \
836-
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
837-
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
838-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
839-
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
840-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
841-
fi
842-
docker manifest push --purge ${MANIFESTIMAGE}:latest
843-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
844-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
821+
done
822+
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
823+
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
824+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
825+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
845826
if [ -n "${SEMVER}" ]; then
846-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
827+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
847828
fi
848829
done
849830
'''

0 commit comments

Comments
 (0)