Skip to content

Commit 9f319ee

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent c32b0fd commit 9f319ee

File tree

1 file changed

+16
-35
lines changed

1 file changed

+16
-35
lines changed

‎Jenkinsfile

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ pipeline {
126126
steps {
127127
script{
128128
env.IMAGE = env.DOCKERHUB_IMAGE
129-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
130129
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
131130
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
132131
if (env.MULTIARCH == 'true') {
@@ -147,7 +146,6 @@ pipeline {
147146
steps {
148147
script{
149148
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
150-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
151149
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
152150
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
153151
if (env.MULTIARCH == 'true') {
@@ -168,7 +166,6 @@ pipeline {
168166
steps {
169167
script{
170168
env.IMAGE = env.PR_DOCKERHUB_IMAGE
171-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
172169
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
173170
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
174171
if (env.MULTIARCH == 'true') {
@@ -533,22 +530,15 @@ pipeline {
533530
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
534531
usernameVariable: 'DOCKERUSER',
535532
passwordVariable: 'DOCKERPASS'
536-
],
537-
[
538-
$class: 'UsernamePasswordMultiBinding',
539-
credentialsId: 'Quay.io-Robot',
540-
usernameVariable: 'QUAYUSER',
541-
passwordVariable: 'QUAYPASS'
542533
]
543534
]) {
544535
retry(5) {
545536
sh '''#! /bin/bash
546537
set -e
547-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
548538
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
549539
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
550540
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
551-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
541+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
552542
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
553543
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:3.9
554544
docker push ${PUSHIMAGE}:3.9
@@ -557,7 +547,7 @@ pipeline {
557547
'''
558548
}
559549
sh '''#! /bin/bash
560-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
550+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
561551
docker rmi \
562552
${DELETEIMAGE}:${META_TAG} \
563553
${DELETEIMAGE}:3.9 || :
@@ -579,18 +569,11 @@ pipeline {
579569
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
580570
usernameVariable: 'DOCKERUSER',
581571
passwordVariable: 'DOCKERPASS'
582-
],
583-
[
584-
$class: 'UsernamePasswordMultiBinding',
585-
credentialsId: 'Quay.io-Robot',
586-
usernameVariable: 'QUAYUSER',
587-
passwordVariable: 'QUAYPASS'
588572
]
589573
]) {
590574
retry(5) {
591575
sh '''#! /bin/bash
592576
set -e
593-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
594577
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
595578
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
596579
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -624,22 +607,20 @@ pipeline {
624607
docker manifest push --purge ${MANIFESTIMAGE}:3.9
625608
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
626609
done
627-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
628-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
629-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
630-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
631-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:3.9
632-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
633-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-3.9
634-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-3.9
635-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
636-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
637-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
638-
docker push ${LEGACYIMAGE}:3.9
639-
docker push ${LEGACYIMAGE}:${META_TAG}
640-
docker push ${LEGACYIMAGE}:arm32v7-3.9
641-
docker push ${LEGACYIMAGE}:arm64v8-3.9
642-
done
610+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
611+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
612+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
613+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:3.9
614+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
615+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-3.9
616+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-3.9
617+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
618+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
619+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
620+
docker push ${GITHUBIMAGE}:3.9
621+
docker push ${GITHUBIMAGE}:${META_TAG}
622+
docker push ${GITHUBIMAGE}:arm32v7-3.9
623+
docker push ${GITHUBIMAGE}:arm64v8-3.9
643624
'''
644625
}
645626
}

0 commit comments

Comments
 (0)