@@ -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(
@@ -362,8 +362,21 @@ pipeline {
362362 }
363363 steps {
364364 echo " Running on node: ${ NODE_NAME} "
365- sh " docker build --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
366- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
365+ sh " docker build \
366+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
367+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
368+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-docker-compose/packages\" \
369+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-docker-compose\" \
370+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-docker-compose\" \
371+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
372+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
373+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
374+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
375+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
376+ --label \" org.opencontainers.image.title=Docker-compose\" \
377+ --label \" org.opencontainers.image.description=docker-compose image by linuxserver.io\" \
378+ --no-cache --pull -t ${ IMAGE} :${ META_TAG} \
379+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
367380 }
368381 }
369382 // Build MultiArch Docker containers for push to LS Repo
@@ -376,8 +389,21 @@ pipeline {
376389 stage(' Build X86' ) {
377390 steps {
378391 echo " Running on node: ${ NODE_NAME} "
379- sh " docker build --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
380- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
392+ sh " docker build \
393+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
394+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
395+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-docker-compose/packages\" \
396+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-docker-compose\" \
397+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-docker-compose\" \
398+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
399+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
400+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
401+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
402+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
403+ --label \" org.opencontainers.image.title=Docker-compose\" \
404+ --label \" org.opencontainers.image.description=docker-compose image by linuxserver.io\" \
405+ --no-cache --pull -t ${ IMAGE} :amd64-${ META_TAG} \
406+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
381407 }
382408 }
383409 stage(' Build ARMHF' ) {
@@ -390,8 +416,21 @@ pipeline {
390416 sh ''' #! /bin/bash
391417 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
392418 '''
393- sh " docker build --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
394- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
419+ sh " docker build \
420+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
421+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
422+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-docker-compose/packages\" \
423+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-docker-compose\" \
424+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-docker-compose\" \
425+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
426+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
427+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
428+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
429+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
430+ --label \" org.opencontainers.image.title=Docker-compose\" \
431+ --label \" org.opencontainers.image.description=docker-compose image by linuxserver.io\" \
432+ --no-cache --pull -f Dockerfile.armhf -t ${ IMAGE} :arm32v7-${ META_TAG} \
433+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
395434 sh " docker tag ${ IMAGE} :arm32v7-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
396435 retry(5 ) {
397436 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -411,8 +450,21 @@ pipeline {
411450 sh ''' #! /bin/bash
412451 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
413452 '''
414- sh " docker build --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
415- --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
453+ sh " docker build \
454+ --label \" org.opencontainers.image.created=${ GITHUB_DATE} \" \
455+ --label \" org.opencontainers.image.authors=linuxserver.io\" \
456+ --label \" org.opencontainers.image.url=https://github.com/linuxserver/docker-docker-compose/packages\" \
457+ --label \" org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-docker-compose\" \
458+ --label \" org.opencontainers.image.source=https://github.com/linuxserver/docker-docker-compose\" \
459+ --label \" org.opencontainers.image.version=${ EXT_RELEASE_CLEAN} -ls${ LS_TAG_NUMBER} \" \
460+ --label \" org.opencontainers.image.revision=${ COMMIT_SHA} \" \
461+ --label \" org.opencontainers.image.vendor=linuxserver.io\" \
462+ --label \" org.opencontainers.image.licenses=GPL-3.0-only\" \
463+ --label \" org.opencontainers.image.ref.name=${ COMMIT_SHA} \" \
464+ --label \" org.opencontainers.image.title=Docker-compose\" \
465+ --label \" org.opencontainers.image.description=docker-compose image by linuxserver.io\" \
466+ --no-cache --pull -f Dockerfile.aarch64 -t ${ IMAGE} :arm64v8-${ META_TAG} \
467+ --build-arg ${ BUILD_VERSION_ARG} =${ EXT_RELEASE} --build-arg VERSION=\" ${ VERSION_TAG} \" --build-arg BUILD_DATE=${ GITHUB_DATE} ."
416468 sh " docker tag ${ IMAGE} :arm64v8-${ META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
417469 retry(5 ) {
418470 sh " docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${ COMMIT_SHA} -${ BUILD_NUMBER} "
@@ -723,7 +775,7 @@ pipeline {
723775 echo '{"tag_name":"'${META_TAG}'",\
724776 "target_commitish": "alpine",\
725777 "name": "'${META_TAG}'",\
726- "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n**Remote Changes:**\\ n\\ n' > start
778+ "body": "**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n\\ n **Remote Changes:**\\ n\\ n' > start
727779 printf '","draft": false,"prerelease": true}' >> releasebody.json
728780 paste -d'\\ 0' start releasebody.json > releasebody.json.done
729781 curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -748,7 +800,7 @@ pipeline {
748800 set -e
749801 TEMPDIR=$(mktemp -d)
750802 docker pull ghcr.io/linuxserver/jenkins-builder:latest
751- docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
803+ docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
752804 docker pull ghcr.io/linuxserver/readme-sync
753805 docker run --rm=true \
754806 -e DOCKERHUB_USERNAME=$DOCKERUSER \
0 commit comments