@@ -56,7 +56,7 @@ pipeline {
5656 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
5757 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
5858 env. PULL_REQUEST = env. CHANGE_ID
59- env. TEMPLATED_FILES = ' Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
59+ env. TEMPLATED_FILES = ' Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/ external_trigger.yml ./.github/workflows/package_trigger.yml'
6060 }
6161 script{
6262 env. LS_RELEASE_NUMBER = sh(
@@ -66,7 +66,7 @@ pipeline {
6666 script{
6767 env. LS_TAG_NUMBER = sh(
6868 script : ''' #! /bin/bash
69- tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
69+ tagsha=$(git rev-list -n 1 arch- ${LS_RELEASE} 2>/dev/null)
7070 if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
7171 echo ${LS_RELEASE_NUMBER}
7272 elif [ -z "${GIT_COMMIT}" ]; then
@@ -770,33 +770,33 @@ pipeline {
770770 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
771771 if [ "${CI}" == "false" ]; then
772772 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
773- docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
774773 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
774+ docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
775775 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
776776 fi
777777 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
778778 docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
779- docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
780- docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
781779 docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-arch
782- docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-arch
783- docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-arch
784780 docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
781+ docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
782+ docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-arch
785783 docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
784+ docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
785+ docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-arch
786786 docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
787787 if [ -n "${SEMVER}" ]; then
788788 docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
789789 docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
790790 docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
791791 fi
792792 docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
793- docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
794- docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
793+ docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
795794 docker push ${MANIFESTIMAGE}:amd64-arch
795+ docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
796796 docker push ${MANIFESTIMAGE}:arm32v7-arch
797- docker push ${MANIFESTIMAGE}:arm64v8-arch
798- docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
799797 docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
798+ docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
799+ docker push ${MANIFESTIMAGE}:arm64v8-arch
800800 docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
801801 if [ -n "${SEMVER}" ]; then
802802 docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -938,12 +938,12 @@ pipeline {
938938 sh ' echo "build aborted"'
939939 }
940940 else if (currentBuild. currentResult == " SUCCESS" ){
941- sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot .png","embeds": [{"color": 1681177,\
941+ sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar .png","embeds": [{"color": 1681177,\
942942 "description": "**Build:** '${BUILD_NUMBER}'\\ n**CI Results:** '${CI_URL}'\\ n**ShellCheck Results:** '${SHELLCHECK_URL}'\\ n**Status:** Success\\ n**Job:** '${RUN_DISPLAY_URL}'\\ n**Change:** '${CODE_URL}'\\ n**External Release:**: '${RELEASE_LINK}'\\ n**DockerHub:** '${DOCKERHUB_LINK}'\\ n"}],\
943943 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
944944 }
945945 else {
946- sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot .png","embeds": [{"color": 16711680,\
946+ sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar .png","embeds": [{"color": 16711680,\
947947 "description": "**Build:** '${BUILD_NUMBER}'\\ n**CI Results:** '${CI_URL}'\\ n**ShellCheck Results:** '${SHELLCHECK_URL}'\\ n**Status:** failure\\ n**Job:** '${RUN_DISPLAY_URL}'\\ n**Change:** '${CODE_URL}'\\ n**External Release:**: '${RELEASE_LINK}'\\ n**DockerHub:** '${DOCKERHUB_LINK}'\\ n"}],\
948948 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
949949 }
0 commit comments