Skip to content

Commit c098891

Browse files
authored
Merge pull request #311 from linuxserver/builder-override
Allow builder override
2 parents 21df58f + 53a019e commit c098891

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

roles/generate-jenkins/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ armhf_native: false
6060
build_armhf: false
6161
image_provenance: false
6262
image_sbom: false
63+
image_builder: 'container'

roles/generate-jenkins/templates/Jenkinsfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ pipeline {
791791
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
792792
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
793793
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
794-
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
794+
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
795795
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
796796
sh '''#! /bin/bash
797797
set -e
@@ -859,7 +859,7 @@ pipeline {
859859
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
860860
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
861861
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
862-
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
862+
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
863863
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
864864
sh '''#! /bin/bash
865865
set -e
@@ -922,7 +922,7 @@ pipeline {
922922
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
923923
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
924924
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
925-
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
925+
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
926926
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
927927
sh '''#! /bin/bash
928928
set -e

0 commit comments

Comments
 (0)