Skip to content

Commit bbcd3e4

Browse files
simonbairdsimonbaird
authored
Merge pull request #3047 from simonbaird/release-v0.7-ubi-bump-251203130916
Ubi digest and konflux refs bump (v0.7)
2 parents f7f7b88 + 12e1018 commit bbcd3e4

File tree

18 files changed

+765
-724
lines changed

18 files changed

+765
-724
lines changed

‎.tekton/cli-v07-pull-request.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ spec:
137137
- name: name
138138
value: init
139139
- name: bundle
140-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
140+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:d6a10101f672a85da0a402177848a82fe7af439bc54451e54b0fbb1ddbeeb1f6
141141
- name: kind
142142
value: task
143143
resolver: bundles
@@ -162,7 +162,7 @@ spec:
162162
- name: name
163163
value: git-clone-oci-ta
164164
- name: bundle
165-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
165+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0a89e1a6304076525e9766f63a4cd006763d21d5aca6863281fc427537a23c6f
166166
- name: kind
167167
value: task
168168
resolver: bundles
@@ -193,7 +193,7 @@ spec:
193193
- name: name
194194
value: prefetch-dependencies-oci-ta
195195
- name: bundle
196-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
196+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:3fa0204a481044b21f0e784ce39cbd25e8fb49c664a5458f3eef351fff1c906e
197197
- name: kind
198198
value: task
199199
resolver: bundles
@@ -236,7 +236,7 @@ spec:
236236
- name: name
237237
value: buildah-oci-ta
238238
- name: bundle
239-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:27b04ea788cf64fd38c7d151feb5e1ca408804fa5a70cf704ae746a086ee92b8
239+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:06caee8bb4eb9e525ff60e816bffb5c895b6a2db454faf0fb2e1066145fe43a6
240240
- name: kind
241241
value: task
242242
resolver: bundles
@@ -265,7 +265,7 @@ spec:
265265
- name: name
266266
value: build-image-index
267267
- name: bundle
268-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
268+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:4c83fd5b679fd07269953b6d5ac667a96096ed2c4dc942d5aea28d989655b109
269269
- name: kind
270270
value: task
271271
resolver: bundles
@@ -291,7 +291,7 @@ spec:
291291
- name: name
292292
value: source-build-oci-ta
293293
- name: bundle
294-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
294+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:4abb2dbc9dcfad52d56b490a2f25f99989a2cb2bbd9881223025272db60fd75e
295295
- name: kind
296296
value: task
297297
resolver: bundles
@@ -359,7 +359,7 @@ spec:
359359
- name: name
360360
value: ecosystem-cert-preflight-checks
361361
- name: bundle
362-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
362+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
363363
- name: kind
364364
value: task
365365
resolver: bundles
@@ -481,7 +481,7 @@ spec:
481481
- name: name
482482
value: apply-tags
483483
- name: bundle
484-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
484+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a61d8a6d0ba804869e8fe57a9289161817afad379ef2d7433d75ae40a148e2ec
485485
- name: kind
486486
value: task
487487
resolver: bundles
@@ -504,7 +504,7 @@ spec:
504504
- name: name
505505
value: push-dockerfile-oci-ta
506506
- name: bundle
507-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
507+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
508508
- name: kind
509509
value: task
510510
resolver: bundles
@@ -521,7 +521,7 @@ spec:
521521
- name: name
522522
value: rpms-signature-scan
523523
- name: bundle
524-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
524+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:6fbbfadb934283fdd22e13cdf6636d6c61b33f8bcc9771aae4ba490ef5c5f28c
525525
- name: kind
526526
value: task
527527
resolver: bundles

‎.tekton/cli-v07-push.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
- name: name
137137
value: init
138138
- name: bundle
139-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
139+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:d6a10101f672a85da0a402177848a82fe7af439bc54451e54b0fbb1ddbeeb1f6
140140
- name: kind
141141
value: task
142142
resolver: bundles
@@ -161,7 +161,7 @@ spec:
161161
- name: name
162162
value: git-clone-oci-ta
163163
- name: bundle
164-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
164+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0a89e1a6304076525e9766f63a4cd006763d21d5aca6863281fc427537a23c6f
165165
- name: kind
166166
value: task
167167
resolver: bundles
@@ -192,7 +192,7 @@ spec:
192192
- name: name
193193
value: prefetch-dependencies-oci-ta
194194
- name: bundle
195-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
195+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:3fa0204a481044b21f0e784ce39cbd25e8fb49c664a5458f3eef351fff1c906e
196196
- name: kind
197197
value: task
198198
resolver: bundles
@@ -235,7 +235,7 @@ spec:
235235
- name: name
236236
value: buildah-oci-ta
237237
- name: bundle
238-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:27b04ea788cf64fd38c7d151feb5e1ca408804fa5a70cf704ae746a086ee92b8
238+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:06caee8bb4eb9e525ff60e816bffb5c895b6a2db454faf0fb2e1066145fe43a6
239239
- name: kind
240240
value: task
241241
resolver: bundles
@@ -264,7 +264,7 @@ spec:
264264
- name: name
265265
value: build-image-index
266266
- name: bundle
267-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
267+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:4c83fd5b679fd07269953b6d5ac667a96096ed2c4dc942d5aea28d989655b109
268268
- name: kind
269269
value: task
270270
resolver: bundles
@@ -290,7 +290,7 @@ spec:
290290
- name: name
291291
value: source-build-oci-ta
292292
- name: bundle
293-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
293+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:4abb2dbc9dcfad52d56b490a2f25f99989a2cb2bbd9881223025272db60fd75e
294294
- name: kind
295295
value: task
296296
resolver: bundles
@@ -358,7 +358,7 @@ spec:
358358
- name: name
359359
value: ecosystem-cert-preflight-checks
360360
- name: bundle
361-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
361+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
362362
- name: kind
363363
value: task
364364
resolver: bundles
@@ -480,7 +480,7 @@ spec:
480480
- name: name
481481
value: apply-tags
482482
- name: bundle
483-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
483+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a61d8a6d0ba804869e8fe57a9289161817afad379ef2d7433d75ae40a148e2ec
484484
- name: kind
485485
value: task
486486
resolver: bundles
@@ -503,7 +503,7 @@ spec:
503503
- name: name
504504
value: push-dockerfile-oci-ta
505505
- name: bundle
506-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
506+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
507507
- name: kind
508508
value: task
509509
resolver: bundles
@@ -520,7 +520,7 @@ spec:
520520
- name: name
521521
value: rpms-signature-scan
522522
- name: bundle
523-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
523+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:6fbbfadb934283fdd22e13cdf6636d6c61b33f8bcc9771aae4ba490ef5c5f28c
524524
- name: kind
525525
value: task
526526
resolver: bundles

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.24.4
1+
golang 1.24.6

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM docker.io/library/golang:1.24.4 AS build
19+
FROM docker.io/library/golang:1.24.6 AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
4343

4444
## Final image
4545

46-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:53ea1f6d835898acda5becdb3f8b1292038a480384bbcf994fc0bcf1f7e8eaf7
46+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:161a4e29ea482bab6048c2b36031b4f302ae81e4ff18b83e61785f40dc576f5d
4747

4848
ARG TARGETOS
4949
ARG TARGETARCH

‎Dockerfile.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM registry.access.redhat.com/ubi9/go-toolset:1.24.4@sha256:81d9cb51feb0b56e3d87a73c2237bebaa80b28e4d5791c1da1140eae50225e2f AS build
19+
FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6@sha256:6234f572204d672a0ee0686d748fbb9b7b05679368bf0d7a4446e13970e58060 AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
4343

4444
## Final image
4545

46-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:53ea1f6d835898acda5becdb3f8b1292038a480384bbcf994fc0bcf1f7e8eaf7
46+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:161a4e29ea482bab6048c2b36031b4f302ae81e4ff18b83e61785f40dc576f5d
4747

4848
ARG TARGETOS
4949
ARG TARGETARCH

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,14 @@ push-snapshot-image: build-snapshot-image ## Push the ec image with the "snapsho
256256
.PHONY: $(ALL_SUPPORTED_IMG_OS_ARCH)
257257
# Targets are in the form of "image_{platform}_{arch}", we set
258258
# TARGETOS={platform}, and TARGETARCH={arch}.
259+
# Pre-evaluate Go cache directories
260+
GOCACHE_DIR:=$(shell go env GOCACHE)
261+
GOMODCACHE_DIR:=$(shell go env GOMODCACHE)
262+
259263
$(ALL_SUPPORTED_IMG_OS_ARCH): TARGETOS=$(word 2,$(subst _, ,$@))
260264
$(ALL_SUPPORTED_IMG_OS_ARCH): TARGETARCH=$(word 3,$(subst _, ,$@))
261265
$(ALL_SUPPORTED_IMG_OS_ARCH):
262-
@podman build -t $(IMAGE_REPO):$(IMAGE_TAG)-$(TARGETOS)-$(TARGETARCH) -f Dockerfile --platform $(TARGETOS)/$(TARGETARCH) --volume "$$(go env GOCACHE)":/go/cache:Z --volume "$$(go env GOMODCACHE)":/go/mod:Z --env GOCACHE=/go/cache --env GOMODCACHE=/go/mod
266+
@podman build -t $(IMAGE_REPO):$(IMAGE_TAG)-$(TARGETOS)-$(TARGETARCH) -f Dockerfile --platform $(TARGETOS)/$(TARGETARCH) --volume "$(GOCACHE_DIR)":/go/cache:Z --volume "$(GOMODCACHE_DIR)":/go/mod:Z --env GOCACHE=/go/cache --env GOMODCACHE=/go/mod
263267

264268
# Currently it shows the following:
265269
# image_linux_amd64

0 commit comments

Comments
 (0)