Skip to content

Commit

Permalink
switch to buildah-task image
Browse files Browse the repository at this point in the history
Signed-off-by: arewm <[email protected]>
  • Loading branch information
arewm committed Jul 5, 2024
1 parent 6dde6fe commit 6f0fbd9
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"quay.io/redhat-appstudio/github-app-token",
"quay.io/konflux-ci/appstudio-utils",
"quay.io/konflux-ci/buildah",
"quay.io/konflux-ci/buildah-task",
"quay.io/konflux-ci/source-container-build",
"quay.io/redhat-appstudio/e2e-tests",
"quay.io/redhat-appstudio/buildah",
Expand Down
2 changes: 1 addition & 1 deletion task/build-image-manifest/0.1/build-image-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
- name: TLSVERIFY
value: $(params.TLSVERIFY)
steps:
- image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
- image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
# per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting
# the cluster will set imagePullPolicy to IfNotPresent
name: build
Expand Down
4 changes: 2 additions & 2 deletions task/buildah-oci-ta/0.1/buildah-oci-ta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ spec:
- $(params.SOURCE_ARTIFACT)=/var/workdir/source
- $(params.CACHI2_ARTIFACT)=/var/workdir/cachi2
- name: build
image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
args:
- $(params.BUILD_ARGS[*])
workingDir: /var/workdir
Expand Down Expand Up @@ -490,7 +490,7 @@ spec:
securityContext:
runAsUser: 0
- name: inject-sbom-and-push
image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
workingDir: /var/workdir
volumeMounts:
- mountPath: /var/lib/containers
Expand Down
4 changes: 2 additions & 2 deletions task/buildah-remote-oci-ta/0.1/buildah-remote-oci-ta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ spec:
- name: YUM_REPOS_D_TARGET
value: $(params.YUM_REPOS_D_TARGET)
- name: BUILDER_IMAGE
value: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
value: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
volumeMounts:
- mountPath: /shared
name: shared
Expand Down Expand Up @@ -563,7 +563,7 @@ spec:
runAsUser: 0
workingDir: /var/workdir
- computeResources: {}
image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
name: inject-sbom-and-push
script: |
base_image_name=$(buildah inspect --format '{{ index .ImageAnnotations "org.opencontainers.image.base.name"}}' $IMAGE | cut -f1 -d'@')
Expand Down
4 changes: 2 additions & 2 deletions task/buildah-remote/0.1/buildah-remote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ spec:
- name: SQUASH
value: $(params.SQUASH)
- name: BUILDER_IMAGE
value: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
value: qquay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
volumeMounts:
- mountPath: /shared
name: shared
Expand Down Expand Up @@ -556,7 +556,7 @@ spec:
runAsUser: 0
workingDir: $(workspaces.source.path)
- computeResources: {}
image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
name: inject-sbom-and-push
script: |
if [ -n "${PARAM_BUILDER_IMAGE}" ]; then
Expand Down
4 changes: 2 additions & 2 deletions task/buildah/0.1/buildah.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
value: $(params.SQUASH)

steps:
- image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
- image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
name: build
computeResources:
limits:
Expand Down Expand Up @@ -458,7 +458,7 @@ spec:
runAsUser: 0

- name: inject-sbom-and-push
image: quay.io/konflux-ci/buildah:latest@sha256:6d41d76152f635b0cb4fe37e96255fe545709a693eeb50f9a3aa63206a372d9e
image: quay.io/konflux-ci/buildah-task:latest@sha256:927517719bc44bb43bc881fef869f830e8d00ad76cee3c083c2dc5f925f99e16
computeResources: {}
script: |
if [ -n "${PARAM_BUILDER_IMAGE}" ]; then
Expand Down

0 comments on commit 6f0fbd9

Please sign in to comment.