Skip to content

Commit 6e4af94

Browse files
Bot Updating Templated Files
1 parent 8a830d7 commit 6e4af94

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

Jenkinsfile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ pipeline {
576576
--label \"org.opencontainers.image.title=Ldap-auth\" \
577577
--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).\" \
578578
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
579-
--provenance=false --sbom=false --builder=container --load \
579+
--provenance=true --sbom=true --builder=container --load \
580580
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
581581
sh '''#! /bin/bash
582582
set -e
@@ -605,7 +605,9 @@ pipeline {
605605
for i in "${CACHE[@]}"; do
606606
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
607607
done
608-
wait
608+
for p in $(jobs -p); do
609+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
610+
done
609611
fi
610612
'''
611613
}
@@ -640,7 +642,7 @@ pipeline {
640642
--label \"org.opencontainers.image.title=Ldap-auth\" \
641643
--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).\" \
642644
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
643-
--provenance=false --sbom=false --builder=container --load \
645+
--provenance=true --sbom=true --builder=container --load \
644646
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
645647
sh '''#! /bin/bash
646648
set -e
@@ -669,7 +671,9 @@ pipeline {
669671
for i in "${CACHE[@]}"; do
670672
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
671673
done
672-
wait
674+
for p in $(jobs -p); do
675+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
676+
done
673677
fi
674678
'''
675679
}
@@ -697,7 +701,7 @@ pipeline {
697701
--label \"org.opencontainers.image.title=Ldap-auth\" \
698702
--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).\" \
699703
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
700-
--provenance=false --sbom=false --builder=container --load \
704+
--provenance=true --sbom=true --builder=container --load \
701705
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
702706
sh '''#! /bin/bash
703707
set -e
@@ -726,7 +730,9 @@ pipeline {
726730
for i in "${CACHE[@]}"; do
727731
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
728732
done
729-
wait
733+
for p in $(jobs -p); do
734+
wait "$p" || { echo "job $p failed" >&2; exit 1; }
735+
done
730736
fi
731737
'''
732738
}
@@ -969,7 +975,7 @@ pipeline {
969975
echo '{"tag_name":"'${META_TAG}'",\
970976
"target_commitish": "master",\
971977
"name": "'${META_TAG}'",\
972-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start
978+
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
973979
printf '","draft": false,"prerelease": false}' >> releasebody.json
974980
paste -d'\\0' start releasebody.json > releasebody.json.done
975981
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

0 commit comments

Comments
 (0)