Skip to content

Commit f038a9a

Browse files
simonbairdsimonbaird
authored
Merge pull request #3048 from simonbaird/main-ubi-bump-251203145351
Ubi digest and konflux refs bump (main)
2 parents 1a6ca15 + 02a22d1 commit f038a9a

File tree

6 files changed

+33
-104
lines changed

6 files changed

+33
-104
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ spec:
142142
- name: name
143143
value: init
144144
- name: bundle
145-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
145+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:a558472b2ff44c4179ae97e90b35098dc2ca1456caf8c16c76f38c6863042c81
146146
- name: kind
147147
value: task
148148
resolver: bundles
@@ -167,7 +167,7 @@ spec:
167167
- name: name
168168
value: git-clone-oci-ta
169169
- name: bundle
170-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
170+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:ea64f5b99202621e78ed3d74b00df5750cbf572c391e6da1956396f5945e4e11
171171
- name: kind
172172
value: task
173173
resolver: bundles
@@ -198,7 +198,7 @@ spec:
198198
- name: name
199199
value: prefetch-dependencies-oci-ta
200200
- name: bundle
201-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
201+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:3fa0204a481044b21f0e784ce39cbd25e8fb49c664a5458f3eef351fff1c906e
202202
- name: kind
203203
value: task
204204
resolver: bundles
@@ -276,7 +276,7 @@ spec:
276276
- name: name
277277
value: build-image-index
278278
- name: bundle
279-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
279+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:4c83fd5b679fd07269953b6d5ac667a96096ed2c4dc942d5aea28d989655b109
280280
- name: kind
281281
value: task
282282
resolver: bundles
@@ -302,7 +302,7 @@ spec:
302302
- name: name
303303
value: source-build-oci-ta
304304
- name: bundle
305-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
305+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:4abb2dbc9dcfad52d56b490a2f25f99989a2cb2bbd9881223025272db60fd75e
306306
- name: kind
307307
value: task
308308
resolver: bundles
@@ -336,7 +336,7 @@ spec:
336336
- name: name
337337
value: tkn-bundle-oci-ta
338338
- name: bundle
339-
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:9713f360e1cb7aa37fc98b633affcaf002ddfee5362b75123447d148cf0f8960
339+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:c0c828c4debfc936bb1b8d83b5b201d47fd8622f8d8e4e7be4c9e84f5d926633
340340
- name: kind
341341
value: task
342342
resolver: bundles
@@ -385,7 +385,7 @@ spec:
385385
- name: name
386386
value: clair-scan
387387
- name: bundle
388-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
388+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:ee558db6af779ab162163ec88f288a5c1b2d5f70c3361f3690a474866e3bdc74
389389
- name: kind
390390
value: task
391391
resolver: bundles
@@ -405,7 +405,7 @@ spec:
405405
- name: name
406406
value: ecosystem-cert-preflight-checks
407407
- name: bundle
408-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
408+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
409409
- name: kind
410410
value: task
411411
resolver: bundles
@@ -527,7 +527,7 @@ spec:
527527
- name: name
528528
value: apply-tags
529529
- name: bundle
530-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
530+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a61d8a6d0ba804869e8fe57a9289161817afad379ef2d7433d75ae40a148e2ec
531531
- name: kind
532532
value: task
533533
resolver: bundles
@@ -550,7 +550,7 @@ spec:
550550
- name: name
551551
value: push-dockerfile-oci-ta
552552
- name: bundle
553-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
553+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
554554
- name: kind
555555
value: task
556556
resolver: bundles
@@ -567,7 +567,7 @@ spec:
567567
- name: name
568568
value: rpms-signature-scan
569569
- name: bundle
570-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
570+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:90c2b32ebf0a00f42c0c1d1675feb75ba71793ad1a4c22ddea7cdc71ed997a04
571571
- name: kind
572572
value: task
573573
resolver: bundles

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ spec:
144144
- name: name
145145
value: init
146146
- name: bundle
147-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
147+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:a558472b2ff44c4179ae97e90b35098dc2ca1456caf8c16c76f38c6863042c81
148148
- name: kind
149149
value: task
150150
resolver: bundles
@@ -169,7 +169,7 @@ spec:
169169
- name: name
170170
value: git-clone-oci-ta
171171
- name: bundle
172-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
172+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:ea64f5b99202621e78ed3d74b00df5750cbf572c391e6da1956396f5945e4e11
173173
- name: kind
174174
value: task
175175
resolver: bundles
@@ -200,7 +200,7 @@ spec:
200200
- name: name
201201
value: prefetch-dependencies-oci-ta
202202
- name: bundle
203-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
203+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:3fa0204a481044b21f0e784ce39cbd25e8fb49c664a5458f3eef351fff1c906e
204204
- name: kind
205205
value: task
206206
resolver: bundles
@@ -278,7 +278,7 @@ spec:
278278
- name: name
279279
value: build-image-index
280280
- name: bundle
281-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
281+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:4c83fd5b679fd07269953b6d5ac667a96096ed2c4dc942d5aea28d989655b109
282282
- name: kind
283283
value: task
284284
resolver: bundles
@@ -304,7 +304,7 @@ spec:
304304
- name: name
305305
value: source-build-oci-ta
306306
- name: bundle
307-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
307+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:4abb2dbc9dcfad52d56b490a2f25f99989a2cb2bbd9881223025272db60fd75e
308308
- name: kind
309309
value: task
310310
resolver: bundles
@@ -338,7 +338,7 @@ spec:
338338
- name: name
339339
value: tkn-bundle-oci-ta
340340
- name: bundle
341-
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:9713f360e1cb7aa37fc98b633affcaf002ddfee5362b75123447d148cf0f8960
341+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:c0c828c4debfc936bb1b8d83b5b201d47fd8622f8d8e4e7be4c9e84f5d926633
342342
- name: kind
343343
value: task
344344
resolver: bundles
@@ -387,7 +387,7 @@ spec:
387387
- name: name
388388
value: clair-scan
389389
- name: bundle
390-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
390+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:ee558db6af779ab162163ec88f288a5c1b2d5f70c3361f3690a474866e3bdc74
391391
- name: kind
392392
value: task
393393
resolver: bundles
@@ -407,7 +407,7 @@ spec:
407407
- name: name
408408
value: ecosystem-cert-preflight-checks
409409
- name: bundle
410-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
410+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
411411
- name: kind
412412
value: task
413413
resolver: bundles
@@ -529,7 +529,7 @@ spec:
529529
- name: name
530530
value: apply-tags
531531
- name: bundle
532-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
532+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a61d8a6d0ba804869e8fe57a9289161817afad379ef2d7433d75ae40a148e2ec
533533
- name: kind
534534
value: task
535535
resolver: bundles
@@ -552,7 +552,7 @@ spec:
552552
- name: name
553553
value: push-dockerfile-oci-ta
554554
- name: bundle
555-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
555+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
556556
- name: kind
557557
value: task
558558
resolver: bundles
@@ -569,7 +569,7 @@ spec:
569569
- name: name
570570
value: rpms-signature-scan
571571
- name: bundle
572-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
572+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:90c2b32ebf0a00f42c0c1d1675feb75ba71793ad1a4c22ddea7cdc71ed997a04
573573
- name: kind
574574
value: task
575575
resolver: bundles

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

‎hack/update-rpm-lock.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,11 @@ base_image_repos=$(mktemp -d --tmpdir)
8383
# extract all /etc/yum.repos.d/* files from the base image
8484
oc image extract "${base_img}" --path /etc/yum.repos.d/*.repo:"${base_image_repos}"
8585
86-
# enable source repositories
87-
for r in $(dnf repolist --setopt=reposdir="${base_image_repos}" --disabled --quiet|grep -- -source | sed "s/ .*//"); do
88-
dnf config-manager --quiet --setopt=reposdir="${base_image_repos}" "${r}" --set-enabled
89-
done
86+
# In the past we used to add enable the source repos, but now we follow the example
87+
# set by MintMaker's automated lock file update PRs and leave the source repos disabled
88+
#for r in $(dnf repolist --setopt=reposdir="${base_image_repos}" --disabled --quiet|grep -- -source | sed "s/ .*//"); do
89+
# dnf config-manager --quiet --setopt=reposdir="${base_image_repos}" "${r}" --set-enabled
90+
#done
9091
9192
# convert ubi repo ids to archful format for better sbom data
9293
sed -i 's/^\[ubi-9-/\[ubi-9-for-$basearch-/' "${base_image_repos}"/*.repo

‎rpms.lock.yaml‎

Lines changed: 4 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,7 @@ arches:
4242
name: jq
4343
evr: 1.6-19.el9
4444
sourcerpm: jq-1.6-19.el9.src.rpm
45-
source:
46-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/appstream/source/SRPMS/Packages/o/oniguruma-6.9.6-1.el9.5.src.rpm
47-
repoid: ubi-9-for-aarch64-appstream-source-rpms
48-
size: 934541
49-
checksum: sha256:cba17754ccaffd886995aec7f152aadbc5d9932a2a2cdf1d983291c7b2838404
50-
name: oniguruma
51-
evr: 6.9.6-1.el9.5
52-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/g/gzip-1.12-1.el9.src.rpm
53-
repoid: ubi-9-for-aarch64-baseos-source-rpms
54-
size: 856147
55-
checksum: sha256:a05f582ec42e89258ee5e10af96dee4300bcb2a6a69a76bfb5b46f79e6a6a47b
56-
name: gzip
57-
evr: 1.12-1.el9
58-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/j/jq-1.6-19.el9.src.rpm
59-
repoid: ubi-9-for-aarch64-baseos-source-rpms
60-
size: 1505339
61-
checksum: sha256:a36173a7f5461f8cc1b6aa9e62f3e0435d6fde658a8795c909fd62cb5bfc9565
62-
name: jq
63-
evr: 1.6-19.el9
45+
source: []
6446
module_metadata: []
6547
- arch: ppc64le
6648
packages:
@@ -85,25 +67,7 @@ arches:
8567
name: jq
8668
evr: 1.6-19.el9
8769
sourcerpm: jq-1.6-19.el9.src.rpm
88-
source:
89-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/appstream/source/SRPMS/Packages/o/oniguruma-6.9.6-1.el9.5.src.rpm
90-
repoid: ubi-9-for-ppc64le-appstream-source-rpms
91-
size: 934541
92-
checksum: sha256:cba17754ccaffd886995aec7f152aadbc5d9932a2a2cdf1d983291c7b2838404
93-
name: oniguruma
94-
evr: 6.9.6-1.el9.5
95-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/g/gzip-1.12-1.el9.src.rpm
96-
repoid: ubi-9-for-ppc64le-baseos-source-rpms
97-
size: 856147
98-
checksum: sha256:a05f582ec42e89258ee5e10af96dee4300bcb2a6a69a76bfb5b46f79e6a6a47b
99-
name: gzip
100-
evr: 1.12-1.el9
101-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/j/jq-1.6-19.el9.src.rpm
102-
repoid: ubi-9-for-ppc64le-baseos-source-rpms
103-
size: 1505339
104-
checksum: sha256:a36173a7f5461f8cc1b6aa9e62f3e0435d6fde658a8795c909fd62cb5bfc9565
105-
name: jq
106-
evr: 1.6-19.el9
70+
source: []
10771
module_metadata: []
10872
- arch: s390x
10973
packages:
@@ -128,25 +92,7 @@ arches:
12892
name: jq
12993
evr: 1.6-19.el9
13094
sourcerpm: jq-1.6-19.el9.src.rpm
131-
source:
132-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/appstream/source/SRPMS/Packages/o/oniguruma-6.9.6-1.el9.5.src.rpm
133-
repoid: ubi-9-for-s390x-appstream-source-rpms
134-
size: 934541
135-
checksum: sha256:cba17754ccaffd886995aec7f152aadbc5d9932a2a2cdf1d983291c7b2838404
136-
name: oniguruma
137-
evr: 6.9.6-1.el9.5
138-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/g/gzip-1.12-1.el9.src.rpm
139-
repoid: ubi-9-for-s390x-baseos-source-rpms
140-
size: 856147
141-
checksum: sha256:a05f582ec42e89258ee5e10af96dee4300bcb2a6a69a76bfb5b46f79e6a6a47b
142-
name: gzip
143-
evr: 1.12-1.el9
144-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/j/jq-1.6-19.el9.src.rpm
145-
repoid: ubi-9-for-s390x-baseos-source-rpms
146-
size: 1505339
147-
checksum: sha256:a36173a7f5461f8cc1b6aa9e62f3e0435d6fde658a8795c909fd62cb5bfc9565
148-
name: jq
149-
evr: 1.6-19.el9
95+
source: []
15096
module_metadata: []
15197
- arch: x86_64
15298
packages:
@@ -171,23 +117,5 @@ arches:
171117
name: jq
172118
evr: 1.6-19.el9
173119
sourcerpm: jq-1.6-19.el9.src.rpm
174-
source:
175-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/appstream/source/SRPMS/Packages/o/oniguruma-6.9.6-1.el9.5.src.rpm
176-
repoid: ubi-9-for-x86_64-appstream-source-rpms
177-
size: 934541
178-
checksum: sha256:cba17754ccaffd886995aec7f152aadbc5d9932a2a2cdf1d983291c7b2838404
179-
name: oniguruma
180-
evr: 6.9.6-1.el9.5
181-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/g/gzip-1.12-1.el9.src.rpm
182-
repoid: ubi-9-for-x86_64-baseos-source-rpms
183-
size: 856147
184-
checksum: sha256:a05f582ec42e89258ee5e10af96dee4300bcb2a6a69a76bfb5b46f79e6a6a47b
185-
name: gzip
186-
evr: 1.12-1.el9
187-
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/j/jq-1.6-19.el9.src.rpm
188-
repoid: ubi-9-for-x86_64-baseos-source-rpms
189-
size: 1505339
190-
checksum: sha256:a36173a7f5461f8cc1b6aa9e62f3e0435d6fde658a8795c909fd62cb5bfc9565
191-
name: jq
192-
evr: 1.6-19.el9
120+
source: []
193121
module_metadata: []

0 commit comments

Comments
 (0)