Skip to content

Commit 304a724

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent a51701d commit 304a724

File tree

1 file changed

+59
-99
lines changed

1 file changed

+59
-99
lines changed

‎Jenkinsfile‎

Lines changed: 59 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
script{
4242
env.EXIT_STATUS = ''
4343
env.LS_RELEASE = sh(
44-
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.10 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
44+
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.10 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
4545
returnStdout: true).trim()
4646
env.LS_RELEASE_NOTES = sh(
4747
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -126,7 +126,7 @@ pipeline {
126126
steps {
127127
script{
128128
env.IMAGE = env.DOCKERHUB_IMAGE
129-
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
129+
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
130130
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
131131
if (env.MULTIARCH == 'true') {
132132
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
@@ -147,7 +147,7 @@ pipeline {
147147
steps {
148148
script{
149149
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
150-
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
150+
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
151151
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
152152
if (env.MULTIARCH == 'true') {
153153
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
@@ -168,7 +168,7 @@ pipeline {
168168
steps {
169169
script{
170170
env.IMAGE = env.PR_DOCKERHUB_IMAGE
171-
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
171+
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
172172
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
173173
if (env.MULTIARCH == 'true') {
174174
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
@@ -189,24 +189,24 @@ pipeline {
189189
}
190190
steps {
191191
withCredentials([
192-
string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
193-
string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
192+
string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
193+
string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET')
194194
]) {
195195
script{
196-
env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
196+
env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
197197
}
198198
sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
199199
sh '''#! /bin/bash
200200
set -e
201-
docker pull lsiodev/spaces-file-upload:latest
201+
docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
202202
docker run --rm \
203203
-e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
204204
-e FILE_NAME="shellcheck-result.xml" \
205205
-e MIMETYPE="text/xml" \
206206
-v ${WORKSPACE}:/mnt \
207-
-e SECRET_KEY=\"${DO_SECRET}\" \
208-
-e ACCESS_KEY=\"${DO_KEY}\" \
209-
-t lsiodev/spaces-file-upload:latest \
207+
-e SECRET_KEY=\"${S3_SECRET}\" \
208+
-e ACCESS_KEY=\"${S3_KEY}\" \
209+
-t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
210210
python /upload.py'''
211211
}
212212
}
@@ -224,8 +224,8 @@ pipeline {
224224
sh '''#! /bin/bash
225225
set -e
226226
TEMPDIR=$(mktemp -d)
227-
docker pull linuxserver/jenkins-builder:latest
228-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=3.10 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
227+
docker pull ghcr.io/linuxserver/jenkins-builder:latest
228+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=3.10 -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
229229
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
230230
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
231231
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -330,57 +330,39 @@ pipeline {
330330
label 'ARMHF'
331331
}
332332
steps {
333-
withCredentials([
334-
[
335-
$class: 'UsernamePasswordMultiBinding',
336-
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
337-
usernameVariable: 'DOCKERUSER',
338-
passwordVariable: 'DOCKERPASS'
339-
]
340-
]) {
341-
echo 'Logging into DockerHub'
342-
sh '''#! /bin/bash
343-
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
344-
'''
345-
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
346-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
347-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
348-
retry(5) {
349-
sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
350-
}
351-
sh '''docker rmi \
352-
${IMAGE}:arm32v7-${META_TAG} \
353-
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
333+
echo 'Logging into Github'
334+
sh '''#! /bin/bash
335+
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
336+
'''
337+
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
338+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
339+
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
340+
retry(5) {
341+
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
354342
}
343+
sh '''docker rmi \
344+
${IMAGE}:arm32v7-${META_TAG} \
345+
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
355346
}
356347
}
357348
stage('Build ARM64') {
358349
agent {
359350
label 'ARM64'
360351
}
361352
steps {
362-
withCredentials([
363-
[
364-
$class: 'UsernamePasswordMultiBinding',
365-
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
366-
usernameVariable: 'DOCKERUSER',
367-
passwordVariable: 'DOCKERPASS'
368-
]
369-
]) {
370-
echo 'Logging into DockerHub'
371-
sh '''#! /bin/bash
372-
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
373-
'''
374-
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
375-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
376-
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
377-
retry(5) {
378-
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
379-
}
380-
sh '''docker rmi \
381-
${IMAGE}:arm64v8-${META_TAG} \
382-
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
353+
echo 'Logging into Github'
354+
sh '''#! /bin/bash
355+
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
356+
'''
357+
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
358+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
359+
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
360+
retry(5) {
361+
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
383362
}
363+
sh '''docker rmi \
364+
${IMAGE}:arm64v8-${META_TAG} \
365+
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
384366
}
385367
}
386368
}
@@ -479,20 +461,20 @@ pipeline {
479461
}
480462
steps {
481463
withCredentials([
482-
string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
483-
string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
464+
string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'),
465+
string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET')
484466
]) {
485467
script{
486-
env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
468+
env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
487469
}
488470
sh '''#! /bin/bash
489471
set -e
490-
docker pull lsiodev/ci:latest
472+
docker pull ghcr.io/linuxserver/lsiodev-ci:latest
491473
if [ "${MULTIARCH}" == "true" ]; then
492-
docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
493-
docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
494-
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
495-
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
474+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
475+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
476+
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
477+
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
496478
fi
497479
docker run --rm \
498480
--shm-size=1gb \
@@ -504,15 +486,15 @@ pipeline {
504486
-e PORT=\"${CI_PORT}\" \
505487
-e SSL=\"${CI_SSL}\" \
506488
-e BASE=\"${DIST_IMAGE}\" \
507-
-e SECRET_KEY=\"${DO_SECRET}\" \
508-
-e ACCESS_KEY=\"${DO_KEY}\" \
489+
-e SECRET_KEY=\"${S3_SECRET}\" \
490+
-e ACCESS_KEY=\"${S3_KEY}\" \
509491
-e DOCKER_ENV=\"${CI_DOCKERENV}\" \
510492
-e WEB_SCREENSHOT=\"${CI_WEB}\" \
511493
-e WEB_AUTH=\"${CI_AUTH}\" \
512494
-e WEB_PATH=\"${CI_WEBPATH}\" \
513495
-e DO_REGION="ams3" \
514496
-e DO_BUCKET="lsio-ci" \
515-
-t lsiodev/ci:latest \
497+
-t ghcr.io/linuxserver/lsiodev-ci:latest \
516498
python /ci/ci.py'''
517499
}
518500
}
@@ -539,7 +521,7 @@ pipeline {
539521
sh '''#! /bin/bash
540522
set -e
541523
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
542-
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
524+
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
543525
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
544526
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
545527
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
@@ -581,15 +563,15 @@ pipeline {
581563
sh '''#! /bin/bash
582564
set -e
583565
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
584-
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
566+
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
585567
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
586568
if [ "${CI}" == "false" ]; then
587-
docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
588-
docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
589-
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
590-
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
569+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
570+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
571+
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
572+
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
591573
fi
592-
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do
574+
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do
593575
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
594576
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
595577
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -623,28 +605,6 @@ pipeline {
623605
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
624606
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
625607
done
626-
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
627-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
628-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
629-
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:3.10
630-
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
631-
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-3.10
632-
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-3.10
633-
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
634-
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
635-
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
636-
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
637-
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
638-
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
639-
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
640-
docker push ${GITHUBIMAGE}:3.10
641-
docker push ${GITHUBIMAGE}:${META_TAG}
642-
docker push ${GITHUBIMAGE}:arm32v7-3.10
643-
docker push ${GITHUBIMAGE}:arm64v8-3.10
644-
docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG}
645-
docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG}
646-
docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG}
647-
docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG}
648608
'''
649609
}
650610
}
@@ -698,17 +658,17 @@ pipeline {
698658
sh '''#! /bin/bash
699659
set -e
700660
TEMPDIR=$(mktemp -d)
701-
docker pull linuxserver/jenkins-builder:latest
702-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
703-
docker pull lsiodev/readme-sync
661+
docker pull ghcr.io/linuxserver/jenkins-builder:latest
662+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
663+
docker pull ghcr.io/linuxserver/lsiodev-readme-sync
704664
docker run --rm=true \
705665
-e DOCKERHUB_USERNAME=$DOCKERUSER \
706666
-e DOCKERHUB_PASSWORD=$DOCKERPASS \
707667
-e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
708668
-e DOCKER_REPOSITORY=${IMAGE} \
709669
-e GIT_BRANCH=master \
710670
-v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
711-
lsiodev/readme-sync bash -c 'node sync'
671+
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
712672
rm -Rf ${TEMPDIR} '''
713673
}
714674
}

0 commit comments

Comments
 (0)