Skip to content

Commit a0dcae2

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent c5b2b31 commit a0dcae2

File tree

1 file changed

+11
-30
lines changed

1 file changed

+11
-30
lines changed

‎Jenkinsfile

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ pipeline {
296296
echo "Jenkinsfile is up to date."
297297
fi
298298
echo "Starting Stage 2 - Delete old templates"
299-
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"
299+
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"
300300
for i in ${OLD_TEMPLATES}; do
301301
if [[ -f "${i}" ]]; then
302302
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -526,6 +526,7 @@ pipeline {
526526
--label \"org.opencontainers.image.title=Ldap-auth\" \
527527
--label \"org.opencontainers.image.description=[Ldap-auth](https://github.com/nginxinc/nginx-ldap-auth) software is for authenticating users who request protected resources from servers proxied by nginx. It includes a daemon (ldap-auth) that communicates with an authentication server, and a webserver daemon that generates an authentication cookie based on the user’s credentials. The daemons are written in Python for use with a Lightweight Directory Access Protocol (LDAP) authentication server (OpenLDAP or Microsoft Windows Active Directory 2003 and 2012).\" \
528528
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
529+
--provenance=false --sbom=false \
529530
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
530531
}
531532
}
@@ -557,6 +558,7 @@ pipeline {
557558
--label \"org.opencontainers.image.title=Ldap-auth\" \
558559
--label \"org.opencontainers.image.description=[Ldap-auth](https://github.com/nginxinc/nginx-ldap-auth) software is for authenticating users who request protected resources from servers proxied by nginx. It includes a daemon (ldap-auth) that communicates with an authentication server, and a webserver daemon that generates an authentication cookie based on the user’s credentials. The daemons are written in Python for use with a Lightweight Directory Access Protocol (LDAP) authentication server (OpenLDAP or Microsoft Windows Active Directory 2003 and 2012).\" \
559560
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
561+
--provenance=false --sbom=false \
560562
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
561563
}
562564
}
@@ -585,6 +587,7 @@ pipeline {
585587
--label \"org.opencontainers.image.title=Ldap-auth\" \
586588
--label \"org.opencontainers.image.description=[Ldap-auth](https://github.com/nginxinc/nginx-ldap-auth) software is for authenticating users who request protected resources from servers proxied by nginx. It includes a daemon (ldap-auth) that communicates with an authentication server, and a webserver daemon that generates an authentication cookie based on the user’s credentials. The daemons are written in Python for use with a Lightweight Directory Access Protocol (LDAP) authentication server (OpenLDAP or Microsoft Windows Active Directory 2003 and 2012).\" \
587589
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
590+
--provenance=false --sbom=false \
588591
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
589592
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
590593
retry(5) {
@@ -708,7 +711,7 @@ pipeline {
708711
--shm-size=1gb \
709712
-v /var/run/docker.sock:/var/run/docker.sock \
710713
-e IMAGE=\"${IMAGE}\" \
711-
-e DELAY_START=\"${CI_DELAY}\" \
714+
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
712715
-e TAGS=\"${CI_TAGS}\" \
713716
-e META_TAG=\"${META_TAG}\" \
714717
-e PORT=\"${CI_PORT}\" \
@@ -816,35 +819,13 @@ pipeline {
816819
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
817820
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
818821
fi
819-
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
820-
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
821-
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
822-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
823-
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
824-
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
825-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
826-
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
827-
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
828-
if [ -n "${SEMVER}" ]; then
829-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
830-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
831-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
832-
fi
833-
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
834-
digest=$(curl -s \
835-
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
836-
--header "Authorization: Bearer ${token}" \
837-
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
838-
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
839-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
840-
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
841-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
842-
fi
843-
docker manifest push --purge ${MANIFESTIMAGE}:latest
844-
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
845-
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
822+
done
823+
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
824+
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
825+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
826+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
846827
if [ -n "${SEMVER}" ]; then
847-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
828+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
848829
fi
849830
done
850831
'''

0 commit comments

Comments
 (0)