From 33fd89e6e877bda67d89f2341836ca5e0d6a8405 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Mon, 1 Jun 2020 23:56:09 -0400
Subject: [PATCH] Bot Updating Templated Files
---
Jenkinsfile | 51 ++++++++++++++++-----------------------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c25e9d0..d853886 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,6 @@ pipeline {
steps {
script{
env.IMAGE = env.DOCKERHUB_IMAGE
- env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
@@ -147,7 +146,6 @@ pipeline {
steps {
script{
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
- env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
@@ -168,7 +166,6 @@ pipeline {
steps {
script{
env.IMAGE = env.PR_DOCKERHUB_IMAGE
- env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
if (env.MULTIARCH == 'true') {
@@ -533,22 +530,15 @@ pipeline {
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
usernameVariable: 'DOCKERUSER',
passwordVariable: 'DOCKERPASS'
- ],
- [
- $class: 'UsernamePasswordMultiBinding',
- credentialsId: 'Quay.io-Robot',
- usernameVariable: 'QUAYUSER',
- passwordVariable: 'QUAYPASS'
]
]) {
retry(5) {
sh '''#! /bin/bash
set -e
- echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
- for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+ for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:xenial
docker push ${PUSHIMAGE}:xenial
@@ -557,7 +547,7 @@ pipeline {
'''
}
sh '''#! /bin/bash
- for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
+ for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
docker rmi \
${DELETEIMAGE}:${META_TAG} \
${DELETEIMAGE}:xenial || :
@@ -579,18 +569,11 @@ pipeline {
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
usernameVariable: 'DOCKERUSER',
passwordVariable: 'DOCKERPASS'
- ],
- [
- $class: 'UsernamePasswordMultiBinding',
- credentialsId: 'Quay.io-Robot',
- usernameVariable: 'QUAYUSER',
- passwordVariable: 'QUAYPASS'
]
]) {
retry(5) {
sh '''#! /bin/bash
set -e
- echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -624,22 +607,20 @@ pipeline {
docker manifest push --purge ${MANIFESTIMAGE}:xenial
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
done
- for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
- docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
- docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
- docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
- docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:xenial
- docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
- docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-xenial
- docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-xenial
- docker push ${LEGACYIMAGE}:amd64-${META_TAG}
- docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
- docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
- docker push ${LEGACYIMAGE}:xenial
- docker push ${LEGACYIMAGE}:${META_TAG}
- docker push ${LEGACYIMAGE}:arm32v7-xenial
- docker push ${LEGACYIMAGE}:arm64v8-xenial
- done
+ docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
+ docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
+ docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
+ docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:xenial
+ docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
+ docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-xenial
+ docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-xenial
+ docker push ${GITHUBIMAGE}:amd64-${META_TAG}
+ docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
+ docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
+ docker push ${GITHUBIMAGE}:xenial
+ docker push ${GITHUBIMAGE}:${META_TAG}
+ docker push ${GITHUBIMAGE}:arm32v7-xenial
+ docker push ${GITHUBIMAGE}:arm64v8-xenial
'''
}
}
--
GitLab