@@ -36,7 +36,7 @@ pipeline {
3636 CI_PORT = ' 8083'
3737 CI_SSL = ' false'
3838 CI_DELAY = ' 120'
39- CI_DOCKERENV = ' TZ=US/Pacific '
39+ CI_DOCKERENV = ' TZ=America/Los_Angeles '
4040 CI_AUTH = ' user:password'
4141 CI_WEBPATH = ' '
4242 }
@@ -351,7 +351,7 @@ pipeline {
351351 echo "Starting Stage 2.5 - Update init diagram"
352352 if ! grep -q 'init_diagram:' readme-vars.yml; then
353353 echo "Adding the key 'init_diagram' to readme-vars.yml"
354- sed -i '\\ |^#.*changelog.*$|d' readme-vars.yml
354+ sed -i '\\ |^#.*changelog.*$|d' readme-vars.yml
355355 sed -i 's|^changelogs:|# init diagram\\ ninit_diagram:\\ n\\ n# changelog\\ nchangelogs:|' readme-vars.yml
356356 fi
357357 mkdir -p ${TEMPDIR}/d2
@@ -585,7 +585,7 @@ pipeline {
585585 --label \" org.opencontainers.image.title=Calibre-web\" \
586586 --label \" org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \
587587 --no-cache --pull -t ${ IMAGE} ${ META_TAG}
588- --provenance=false --sbom=false --builder=container --load \
588+ --provenance=true --sbom=true --builder=container --load \
589589 --build-arg ${ BUILD_VERSION_ARG} ${ EXT_RELEASE} \" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} "
590590 sh ''' #! /bin/bash
591591 set -e
@@ -614,7 +614,9 @@ pipeline {
614614 for i in "${CACHE[@]}"; do
615615 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
616616 done
617- wait
617+ for p in $(jobs -p); do
618+ wait "$p" || { echo "job $p failed" >&2; exit 1; }
619+ done
618620 fi
619621 '''
620622 }
@@ -649,7 +651,7 @@ pipeline {
649651 --label \" org.opencontainers.image.title=Calibre-web\" \
650652 --label \" org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \
651653 --no-cache --pull -t ${ IMAGE} ${ META_TAG}
652- --provenance=false --sbom=false --builder=container --load \
654+ --provenance=true --sbom=true --builder=container --load \
653655 --build-arg ${ BUILD_VERSION_ARG} ${ EXT_RELEASE} \" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} "
654656 sh ''' #! /bin/bash
655657 set -e
@@ -678,7 +680,9 @@ pipeline {
678680 for i in "${CACHE[@]}"; do
679681 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
680682 done
681- wait
683+ for p in $(jobs -p); do
684+ wait "$p" || { echo "job $p failed" >&2; exit 1; }
685+ done
682686 fi
683687 '''
684688 }
@@ -706,7 +710,7 @@ pipeline {
706710 --label \" org.opencontainers.image.title=Calibre-web\" \
707711 --label \" org.opencontainers.image.description=[Calibre-web](https://github.com/janeczku/calibre-web) is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. It is also possible to integrate google drive and edit metadata and your calibre library through the app itself. This software is a fork of library and licensed under the GPL v3 License. \" \
708712 --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} ${ META_TAG}
709- --provenance=false --sbom=false --builder=container --load \
713+ --provenance=true --sbom=true --builder=container --load \
710714 --build-arg ${ BUILD_VERSION_ARG} ${ EXT_RELEASE} \" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} "
711715 sh ''' #! /bin/bash
712716 set -e
@@ -735,7 +739,9 @@ pipeline {
735739 for i in "${CACHE[@]}"; do
736740 docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
737741 done
738- wait
742+ for p in $(jobs -p); do
743+ wait "$p" || { echo "job $p failed" >&2; exit 1; }
744+ done
739745 fi
740746 '''
741747 }
@@ -899,15 +905,15 @@ pipeline {
899905 retry_backoff(5 ,5 ) {
900906 sh ''' #! /bin/bash
901907 set -e
902- for PUSHIMAGE in "${GITHUBIMAGE }" "${GITLABIMAGE}" "${QUAYIMAGE }" "${IMAGE }"; do
908+ for PUSHIMAGE in "${IMAGE }" "${GITLABIMAGE}" "${GITHUBIMAGE }" "${QUAYIMAGE }"; do
903909 [[ ${PUSHIMAGE%%/*} =~ \\ . ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
904910 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
905911 for i in "${CACHE[@]}"; do
906912 if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
907913 CACHEIMAGE=${i}
908914 fi
909915 done
910- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t {PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
916+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t $ {PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
911917 if [ -n "${SEMVER}" ]; then
912918 docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
913919 fi
@@ -978,7 +984,7 @@ pipeline {
978984 echo '{"tag_name":"'${META_TAG}'",\
979985 "target_commitish": "master",\
980986 "name": "'${META_TAG}'",\
981- "body": "**CI Report:**\\ n\\ n'${CI_URL:-N/A}'\\ n\\ n**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n\\ n**'${EXT_REPO}' Changes:**\\ n\\ n' > start
987+ "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
982988 printf '","draft": false,"prerelease": false}' >> releasebody.json
983989 paste -d'\\ 0' start releasebody.json > releasebody.json.done
984990 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