@@ -138,7 +138,6 @@ pipeline {
138138 steps {
139139 script{
140140 env. IMAGE = env. DOCKERHUB_IMAGE
141- env. QUAYIMAGE = ' quay.io/linuxserver.io/' + env. CONTAINER_NAME
142141 env. GITHUBIMAGE = ' docker.pkg.github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /' + env. CONTAINER_NAME
143142 env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /' + env. CONTAINER_NAME
144143 if (env. MULTIARCH == ' true' ) {
@@ -159,7 +158,6 @@ pipeline {
159158 steps {
160159 script{
161160 env. IMAGE = env. DEV_DOCKERHUB_IMAGE
162- env. QUAYIMAGE = ' quay.io/linuxserver.io/lsiodev-' + env. CONTAINER_NAME
163161 env. GITHUBIMAGE = ' docker.pkg.github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /lsiodev-' + env. CONTAINER_NAME
164162 env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /lsiodev-' + env. CONTAINER_NAME
165163 if (env. MULTIARCH == ' true' ) {
@@ -180,7 +178,6 @@ pipeline {
180178 steps {
181179 script{
182180 env. IMAGE = env. PR_DOCKERHUB_IMAGE
183- env. QUAYIMAGE = ' quay.io/linuxserver.io/lspipepr-' + env. CONTAINER_NAME
184181 env. GITHUBIMAGE = ' docker.pkg.github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /lspipepr-' + env. CONTAINER_NAME
185182 env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /lspipepr-' + env. CONTAINER_NAME
186183 if (env. MULTIARCH == ' true' ) {
@@ -545,22 +542,15 @@ pipeline {
545542 credentialsId : ' 3f9ba4d5-100d-45b0-a3c4-633fd6061207' ,
546543 usernameVariable : ' DOCKERUSER' ,
547544 passwordVariable : ' DOCKERPASS'
548- ],
549- [
550- $class : ' UsernamePasswordMultiBinding' ,
551- credentialsId : ' Quay.io-Robot' ,
552- usernameVariable : ' QUAYUSER' ,
553- passwordVariable : ' QUAYPASS'
554545 ]
555546 ]) {
556547 retry(5 ) {
557548 sh ''' #! /bin/bash
558549 set -e
559- echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
560550 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
561551 echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
562552 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
563- for PUSHIMAGE in "${QUAYIMAGE}" "${ GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
553+ for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
564554 docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
565555 docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:bionic
566556 docker push ${PUSHIMAGE}:bionic
@@ -569,7 +559,7 @@ pipeline {
569559 '''
570560 }
571561 sh ''' #! /bin/bash
572- for DELETEIMAGE in "${QUAYIMAGE}" "${ GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
562+ for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
573563 docker rmi \
574564 ${DELETEIMAGE}:${META_TAG} \
575565 ${DELETEIMAGE}:bionic || :
@@ -591,18 +581,11 @@ pipeline {
591581 credentialsId : ' 3f9ba4d5-100d-45b0-a3c4-633fd6061207' ,
592582 usernameVariable : ' DOCKERUSER' ,
593583 passwordVariable : ' DOCKERPASS'
594- ],
595- [
596- $class : ' UsernamePasswordMultiBinding' ,
597- credentialsId : ' Quay.io-Robot' ,
598- usernameVariable : ' QUAYUSER' ,
599- passwordVariable : ' QUAYPASS'
600584 ]
601585 ]) {
602586 retry(5 ) {
603587 sh ''' #! /bin/bash
604588 set -e
605- echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
606589 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
607590 echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
608591 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -636,22 +619,20 @@ pipeline {
636619 docker manifest push --purge ${MANIFESTIMAGE}:bionic
637620 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
638621 done
639- for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
640- docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
641- docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
642- docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
643- docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:bionic
644- docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
645- docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-bionic
646- docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-bionic
647- docker push ${LEGACYIMAGE}:amd64-${META_TAG}
648- docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
649- docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
650- docker push ${LEGACYIMAGE}:bionic
651- docker push ${LEGACYIMAGE}:${META_TAG}
652- docker push ${LEGACYIMAGE}:arm32v7-bionic
653- docker push ${LEGACYIMAGE}:arm64v8-bionic
654- done
622+ docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
623+ docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
624+ docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
625+ docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:bionic
626+ docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
627+ docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-bionic
628+ docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-bionic
629+ docker push ${GITHUBIMAGE}:amd64-${META_TAG}
630+ docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
631+ docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
632+ docker push ${GITHUBIMAGE}:bionic
633+ docker push ${GITHUBIMAGE}:${META_TAG}
634+ docker push ${GITHUBIMAGE}:arm32v7-bionic
635+ docker push ${GITHUBIMAGE}:arm64v8-bionic
655636 '''
656637 }
657638 }
0 commit comments