@@ -57,7 +57,7 @@ pipeline {
5757 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
5858 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
5959 env. PULL_REQUEST = env. CHANGE_ID
60- env. TEMPLATED_FILES = ' Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings .yml ./.github/workflows/stale .yml ./root/donate.txt ./. github/workflows/package_trigger .yml ./.github/workflows/package_trigger_scheduler .yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler .yml'
60+ env. TEMPLATED_FILES = ' Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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 ./root/donate.txt '
6161 }
6262 script{
6363 env. LS_RELEASE_NUMBER = sh(
@@ -309,22 +309,24 @@ pipeline {
309309 git commit -m 'Bot Updating Documentation'
310310 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
311311 fi
312- mkdir -p ${TEMPDIR}/unraid
312+ mkdir -p ${TEMPDIR}/unraid
313313 git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
314314 git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
315- if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon .png ]]; then
316- sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon .png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
315+ if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo .png ]]; then
316+ sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo .png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
317317 fi
318318 if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
319+ cd ${TEMPDIR}/unraid/templates/
319320 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
320- echo "Image is on the ignore list, skipping Unraid template upload"
321+ echo "Image is on the ignore list, removing Unraid template"
322+ git rm unraid/${CONTAINER_NAME}.xml || :
323+ git commit -m 'Bot Removing Deprecated Unraid Template' || :
321324 else
322325 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
323- cd ${TEMPDIR}/unraid/templates/
324326 git add unraid/${CONTAINER_NAME}.xml
325327 git commit -m 'Bot Updating Unraid Template'
326- git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
327328 fi
329+ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
328330 fi
329331 rm -Rf ${TEMPDIR}'''
330332 script{
@@ -381,8 +383,21 @@ pipeline {
381383 }
382384 steps {
383385 echo " Running on node: ${ NODE_NAME} "
384- sh " docker build --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
385- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
386+ sh " docker build \
387+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
388+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
389+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-embystat/packages\" \
390+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-embystat\" \
391+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-embystat\" \
392+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
393+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
394+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
395+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
396+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
397+ --label \" org.opencontainers.image.title=Embystat\" \
398+ --label \" org.opencontainers.image.description=[Embystat](https://github.com/mregni/EmbyStat) is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.\" \
399+ --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
400+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
386401 }
387402 }
388403 // Build MultiArch Docker containers for push to LS Repo
@@ -395,8 +410,21 @@ pipeline {
395410 stage(' Build X86' ) {
396411 steps {
397412 echo " Running on node: ${ NODE_NAME} "
398- sh " docker build --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
399- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
413+ sh " docker build \
414+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
415+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
416+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-embystat/packages\" \
417+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-embystat\" \
418+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-embystat\" \
419+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
420+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
421+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
422+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
423+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
424+ --label \" org.opencontainers.image.title=Embystat\" \
425+ --label \" org.opencontainers.image.description=[Embystat](https://github.com/mregni/EmbyStat) is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.\" \
426+ --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
427+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
400428 }
401429 }
402430 stage(' Build ARMHF' ) {
@@ -409,8 +437,21 @@ pipeline {
409437 sh ''' #! /bin/bash
410438 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
411439 '''
412- sh " docker build --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
413- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
440+ sh " docker build \
441+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
442+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
443+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-embystat/packages\" \
444+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-embystat\" \
445+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-embystat\" \
446+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
447+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
448+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
449+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
450+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
451+ --label \" org.opencontainers.image.title=Embystat\" \
452+ --label \" org.opencontainers.image.description=[Embystat](https://github.com/mregni/EmbyStat) is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.\" \
453+ --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
454+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
414455 sh " docker tag ${ IMAGE} :arm32v7-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
415456 retry(5 ) {
416457 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -430,8 +471,21 @@ pipeline {
430471 sh ''' #! /bin/bash
431472 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
432473 '''
433- sh " docker build --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
434- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
474+ sh " docker build \
475+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
476+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
477+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-embystat/packages\" \
478+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-embystat\" \
479+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-embystat\" \
480+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
481+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
482+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
483+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
484+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
485+ --label \" org.opencontainers.image.title=Embystat\" \
486+ --label \" org.opencontainers.image.description=[Embystat](https://github.com/mregni/EmbyStat) is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.\" \
487+ --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
488+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
435489 sh " docker tag ${ IMAGE} :arm64v8-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
436490 retry(5 ) {
437491 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -742,7 +796,7 @@ pipeline {
742796 echo '{"tag_name":"'${META_TAG}'",\
743797 "target_commitish": "master",\
744798 "name": "'${META_TAG}'",\
745- "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n**Remote Changes:**\\ n\\ n' > start
799+ "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n\\ n **Remote Changes:**\\ n\\ n' > start
746800 printf '","draft": false,"prerelease": false}' >> releasebody.json
747801 paste -d'\\ 0' start releasebody.json > releasebody.json.done
748802 curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -767,7 +821,7 @@ pipeline {
767821 set -e
768822 TEMPDIR=$(mktemp -d)
769823 docker pull ghcr.io/linuxserver/jenkins-builder:latest
770- docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
824+ docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
771825 docker pull ghcr.io/linuxserver/readme-sync
772826 docker run --rm=true \
773827 -e DOCKERHUB_USERNAME=$DOCKERUSER \
0 commit comments