diff --git a/Jenkinsfile b/Jenkinsfile index 43262a8..4dcc816 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -504,7 +504,7 @@ pipeline { --label \"org.opencontainers.image.title=Modmanager\" \ --label \"org.opencontainers.image.description=modmanager image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=default --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -570,7 +570,7 @@ pipeline { --label \"org.opencontainers.image.title=Modmanager\" \ --label \"org.opencontainers.image.description=modmanager image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=default --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -629,7 +629,7 @@ pipeline { --label \"org.opencontainers.image.title=Modmanager\" \ --label \"org.opencontainers.image.description=modmanager image by linuxserver.io\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=default --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 86cd42e..f431a21 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,9 +6,6 @@ external_type: os release_type: stable release_tag: latest ls_branch: main -image_provenance: false -image_sbom: false -image_builder: default repo_vars: - CONTAINER_NAME = 'modmanager' - BUILD_VERSION_ARG = 'OS'