Skip to content

Commit

Permalink
Allow builder override
Browse files Browse the repository at this point in the history
thespad committed Dec 3, 2024
1 parent 21df58f commit 53a019e
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions roles/generate-jenkins/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -60,3 +60,4 @@ armhf_native: false
build_armhf: false
image_provenance: false
image_sbom: false
image_builder: 'container'
6 changes: 3 additions & 3 deletions roles/generate-jenkins/templates/Jenkinsfile.j2
Original file line number Diff line number Diff line change
@@ -791,7 +791,7 @@ pipeline {
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh '''#! /bin/bash
set -e
@@ -859,7 +859,7 @@ pipeline {
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh '''#! /bin/bash
set -e
@@ -922,7 +922,7 @@ pipeline {
--label \"org.opencontainers.image.title={{ project_name|capitalize }}\" \
--label \"org.opencontainers.image.description={% if project_blurb is defined %}{{ project_blurb | replace('"', '') | replace('\n', ' ') }}{% else %}{{ project_name }} image by {{ lsio_project_name }}{% endif %}\" \
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder=container --load \
--provenance={{ image_provenance | lower }} --sbom={{ image_sbom | lower }} --builder={{ image_builder }} --load \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh '''#! /bin/bash
set -e

0 comments on commit 53a019e

Please sign in to comment.