@@ -55,7 +55,7 @@ pipeline {
5555 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
5656 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
5757 env. PULL_REQUEST = env. CHANGE_ID
58- 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 ./.github/workflows/package_trigger .yml ./.github/workflows/package_trigger_scheduler .yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler .yml'
58+ 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'
5959 }
6060 script{
6161 env. LS_RELEASE_NUMBER = sh(
@@ -360,8 +360,21 @@ pipeline {
360360 }
361361 steps {
362362 echo " Running on node: ${ NODE_NAME} "
363- sh " docker build --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
364- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
363+ sh " docker build \
364+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
365+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
366+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-alpine-nginx/packages\" \
367+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-alpine-nginx\" \
368+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-alpine-nginx\" \
369+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
370+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
371+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
372+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
373+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
374+ --label \" org.opencontainers.image.title=Baseimage-alpine-nginx\" \
375+ --label \" org.opencontainers.image.description=baseimage-alpine-nginx image by linuxserver.io\" \
376+ --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
377+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
365378 }
366379 }
367380 // Build MultiArch Docker containers for push to LS Repo
@@ -374,8 +387,21 @@ pipeline {
374387 stage(' Build X86' ) {
375388 steps {
376389 echo " Running on node: ${ NODE_NAME} "
377- sh " docker build --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
378- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
390+ sh " docker build \
391+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
392+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
393+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-alpine-nginx/packages\" \
394+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-alpine-nginx\" \
395+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-alpine-nginx\" \
396+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
397+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
398+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
399+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
400+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
401+ --label \" org.opencontainers.image.title=Baseimage-alpine-nginx\" \
402+ --label \" org.opencontainers.image.description=baseimage-alpine-nginx image by linuxserver.io\" \
403+ --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
404+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
379405 }
380406 }
381407 stage(' Build ARMHF' ) {
@@ -388,8 +414,21 @@ pipeline {
388414 sh ''' #! /bin/bash
389415 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
390416 '''
391- sh " docker build --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
392- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
417+ sh " docker build \
418+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
419+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
420+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-alpine-nginx/packages\" \
421+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-alpine-nginx\" \
422+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-alpine-nginx\" \
423+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
424+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
425+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
426+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
427+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
428+ --label \" org.opencontainers.image.title=Baseimage-alpine-nginx\" \
429+ --label \" org.opencontainers.image.description=baseimage-alpine-nginx image by linuxserver.io\" \
430+ --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
431+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
393432 sh " docker tag ${ IMAGE} :arm32v7-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
394433 retry(5 ) {
395434 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -409,8 +448,21 @@ pipeline {
409448 sh ''' #! /bin/bash
410449 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
411450 '''
412- sh " docker build --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
413- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
451+ sh " docker build \
452+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
453+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
454+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-alpine-nginx/packages\" \
455+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-alpine-nginx\" \
456+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-alpine-nginx\" \
457+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
458+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
459+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
460+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
461+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
462+ --label \" org.opencontainers.image.title=Baseimage-alpine-nginx\" \
463+ --label \" org.opencontainers.image.description=baseimage-alpine-nginx image by linuxserver.io\" \
464+ --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
465+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
414466 sh " docker tag ${ IMAGE} :arm64v8-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
415467 retry(5 ) {
416468 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -704,7 +756,7 @@ pipeline {
704756 echo '{"tag_name":"'${META_TAG}'",\
705757 "target_commitish": "3.11",\
706758 "name": "'${META_TAG}'",\
707- "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n**OS Changes:**\\ n\\ n' > start
759+ "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n\\ n **OS Changes:**\\ n\\ n' > start
708760 printf '","draft": false,"prerelease": true}' >> releasebody.json
709761 paste -d'\\ 0' start releasebody.json > releasebody.json.done
710762 curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -729,7 +781,7 @@ pipeline {
729781 set -e
730782 TEMPDIR=$(mktemp -d)
731783 docker pull ghcr.io/linuxserver/jenkins-builder:latest
732- docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
784+ docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
733785 docker pull ghcr.io/linuxserver/readme-sync
734786 docker run --rm=true \
735787 -e DOCKERHUB_USERNAME=$DOCKERUSER \
0 commit comments