Skip to content

Commit 3552223

Browse files
happybhaticursoragent
happybhati
and
cursoragent
committed
fix: enable cross-platform vendor stages for buildah 0.10 arm64 builds
Add FROM --platform=linux/amd64 on vendor COPY stages and set ALLOW_CROSS_PLATFORM_IMAGES=true on build-images to tolerate amd64-only vendor images on arm64. Pin glibc-devel-2.39-124.el10_2 before dnf install to work around UBI10 glibc-gconv-extra repo lag on amd64 with buildah 0.10. Omit rpm-build until glibc-gconv-extra 126 is published. Bump UBI10 base to 10.2-1782277716. Align Konflux task digests with MintMaker konflux-ci#781. Signed-off-by: Happy Bhati <hbhati@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 586cbe7 commit 3552223

3 files changed

Lines changed: 34 additions & 28 deletions

File tree

‎.tekton/release-service-utils-standalone-pull-request.yaml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
- name: name
6464
value: summary
6565
- name: bundle
66-
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:e1b8e42962b0c6d9ebe95f3709c34ae5e1569b73941a79654248e0af55eb3ff9
66+
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:a009e5892e0ef23f8c45fe98a96d6c56aff3bdc0343d994f30661e56ff901253
6767
- name: kind
6868
value: task
6969
resolver: bundles
@@ -171,7 +171,7 @@ spec:
171171
- name: name
172172
value: git-clone-oci-ta
173173
- name: bundle
174-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
174+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:52827a47564514f6accab971b8fad4f1c1cf59997507ed7c4e534615eeeae567
175175
- name: kind
176176
value: task
177177
resolver: bundles
@@ -197,7 +197,7 @@ spec:
197197
- name: name
198198
value: prefetch-dependencies-oci-ta
199199
- name: bundle
200-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:3dc78afbf3a441e0280067433cb28ea3d2d0088ec214c73bf063f145b4f273ef
200+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
201201
- name: kind
202202
value: task
203203
resolver: bundles
@@ -231,14 +231,16 @@ spec:
231231
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
232232
- name: BUILDAH_FORMAT
233233
value: $(params.buildah-format)
234+
- name: ALLOW_CROSS_PLATFORM_IMAGES
235+
value: "true"
234236
runAfter:
235237
- prefetch-dependencies
236238
taskRef:
237239
params:
238240
- name: name
239241
value: buildah-remote-oci-ta
240242
- name: bundle
241-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
243+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:ae1b7a3010b37c55b7702de7a9d3ab61410f7931d1a77f15b3809395d31a9346
242244
- name: kind
243245
value: task
244246
resolver: bundles
@@ -260,7 +262,7 @@ spec:
260262
- name: name
261263
value: build-image-index
262264
- name: bundle
263-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
265+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:0b4251ea0fab38be2b1441bea2788220d4cf2963ffb854a0ed90992fbabbe122
264266
- name: kind
265267
value: task
266268
resolver: bundles
@@ -281,7 +283,7 @@ spec:
281283
- name: name
282284
value: source-build-oci-ta
283285
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
286+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
285287
- name: kind
286288
value: task
287289
resolver: bundles
@@ -330,7 +332,7 @@ spec:
330332
- name: name
331333
value: clair-scan
332334
- name: bundle
333-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
335+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
334336
- name: kind
335337
value: task
336338
resolver: bundles
@@ -354,7 +356,7 @@ spec:
354356
- name: name
355357
value: sast-snyk-check
356358
- name: bundle
357-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:566753ca880764361b11f2c67d8e62dda94f829b11cb48e4716f27568216a481
359+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:5c0f322c3b46577008d3a29ad34f84ea628ec7fc4825e92aa213e945bf31af81
358360
- name: kind
359361
value: task
360362
resolver: bundles
@@ -381,7 +383,7 @@ spec:
381383
- name: name
382384
value: sast-shell-check
383385
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:2cd09c97b9f0fae9c7bcd26d956f77221fb7137ee8b2ef17e7351b5e6f1eb89e
386+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:f0fb21cf7028224146d4ab4f42395c9f03b99f1d93720745e07f97d146d1f897
385387
- name: kind
386388
value: task
387389
resolver: bundles
@@ -408,7 +410,7 @@ spec:
408410
- name: name
409411
value: sast-unicode-check
410412
- name: bundle
411-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:c162d9d0cd1e4c64dfc340577ba8e6bf55ebd1bb859fe3157217de9b4473c640
413+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:633cf558e850517b9e2891af4ccb34f6b3ba249613693130ca130a541a5a70ff
412414
- name: kind
413415
value: task
414416
resolver: bundles
@@ -460,7 +462,7 @@ spec:
460462
- name: name
461463
value: rpms-signature-scan
462464
- name: bundle
463-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
465+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
464466
- name: kind
465467
value: task
466468
resolver: bundles

‎.tekton/release-service-utils-standalone-push.yaml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
- name: name
5757
value: summary
5858
- name: bundle
59-
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:e1b8e42962b0c6d9ebe95f3709c34ae5e1569b73941a79654248e0af55eb3ff9
59+
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:a009e5892e0ef23f8c45fe98a96d6c56aff3bdc0343d994f30661e56ff901253
6060
- name: kind
6161
value: task
6262
resolver: bundles
@@ -164,7 +164,7 @@ spec:
164164
- name: name
165165
value: git-clone-oci-ta
166166
- name: bundle
167-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
167+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:52827a47564514f6accab971b8fad4f1c1cf59997507ed7c4e534615eeeae567
168168
- name: kind
169169
value: task
170170
resolver: bundles
@@ -190,7 +190,7 @@ spec:
190190
- name: name
191191
value: prefetch-dependencies-oci-ta
192192
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:3dc78afbf3a441e0280067433cb28ea3d2d0088ec214c73bf063f145b4f273ef
193+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
194194
- name: kind
195195
value: task
196196
resolver: bundles
@@ -224,14 +224,16 @@ spec:
224224
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
225225
- name: BUILDAH_FORMAT
226226
value: $(params.buildah-format)
227+
- name: ALLOW_CROSS_PLATFORM_IMAGES
228+
value: "true"
227229
runAfter:
228230
- prefetch-dependencies
229231
taskRef:
230232
params:
231233
- name: name
232234
value: buildah-remote-oci-ta
233235
- name: bundle
234-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
236+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:ae1b7a3010b37c55b7702de7a9d3ab61410f7931d1a77f15b3809395d31a9346
235237
- name: kind
236238
value: task
237239
resolver: bundles
@@ -253,7 +255,7 @@ spec:
253255
- name: name
254256
value: build-image-index
255257
- name: bundle
256-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:b33bfa8dc27dbf459f0779598ba45dcaa490bcc9f8efe1652bcf360ec8cb5582
258+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:0b4251ea0fab38be2b1441bea2788220d4cf2963ffb854a0ed90992fbabbe122
257259
- name: kind
258260
value: task
259261
resolver: bundles
@@ -274,7 +276,7 @@ spec:
274276
- name: name
275277
value: source-build-oci-ta
276278
- name: bundle
277-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
279+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
278280
- name: kind
279281
value: task
280282
resolver: bundles
@@ -323,7 +325,7 @@ spec:
323325
- name: name
324326
value: clair-scan
325327
- name: bundle
326-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
328+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
327329
- name: kind
328330
value: task
329331
resolver: bundles
@@ -347,7 +349,7 @@ spec:
347349
- name: name
348350
value: sast-snyk-check
349351
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:566753ca880764361b11f2c67d8e62dda94f829b11cb48e4716f27568216a481
352+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:5c0f322c3b46577008d3a29ad34f84ea628ec7fc4825e92aa213e945bf31af81
351353
- name: kind
352354
value: task
353355
resolver: bundles
@@ -374,7 +376,7 @@ spec:
374376
- name: name
375377
value: sast-shell-check
376378
- name: bundle
377-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:2cd09c97b9f0fae9c7bcd26d956f77221fb7137ee8b2ef17e7351b5e6f1eb89e
379+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:f0fb21cf7028224146d4ab4f42395c9f03b99f1d93720745e07f97d146d1f897
378380
- name: kind
379381
value: task
380382
resolver: bundles
@@ -401,7 +403,7 @@ spec:
401403
- name: name
402404
value: sast-unicode-check
403405
- name: bundle
404-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:c162d9d0cd1e4c64dfc340577ba8e6bf55ebd1bb859fe3157217de9b4473c640
406+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:633cf558e850517b9e2891af4ccb34f6b3ba249613693130ca130a541a5a70ff
405407
- name: kind
406408
value: task
407409
resolver: bundles
@@ -453,7 +455,7 @@ spec:
453455
- name: name
454456
value: rpms-signature-scan
455457
- name: bundle
456-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
458+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
457459
- name: kind
458460
value: task
459461
resolver: bundles

‎Dockerfile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM quay.io/konflux-ci/oras:latest@sha256:6cea0b9e142c2e18429f5cd30d716715d932047cbf1631334c5c31f7e47c3a19 as oras
22

3-
FROM registry.redhat.io/rhtas/ec-rhel9:0.7@sha256:1fc7c6171d5a6058fa4df1c791906fdbd94df06df048b8230a4d11d1cf9da489 as conforma-cli
3+
FROM --platform=linux/amd64 registry.redhat.io/rhtas/ec-rhel9:0.7@sha256:1fc7c6171d5a6058fa4df1c791906fdbd94df06df048b8230a4d11d1cf9da489 as conforma-cli
44

5-
FROM registry.redhat.io/rhtas/cosign-rhel9:1.3.3-1773309431 as cosign
5+
FROM --platform=linux/amd64 registry.redhat.io/rhtas/cosign-rhel9:1.3.3-1773309431 as cosign
66

7-
FROM registry.redhat.io/advanced-cluster-security/rhacs-roxctl-rhel8:4.10.4-1 as roxctl
7+
FROM --platform=linux/amd64 registry.redhat.io/advanced-cluster-security/rhacs-roxctl-rhel8:4.10.4-1 as roxctl
88

9-
FROM registry.access.redhat.com/ubi10/ubi:10.2-1780550529
9+
FROM registry.access.redhat.com/ubi10/ubi:10.2-1782277716
1010

1111
ARG COSIGN_VERSION=2.4.1
1212
ARG COSIGN3_VERSION=3.0.4
@@ -84,7 +84,10 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
8484
RUN dnf install -y 'dnf-command(config-manager)' && \
8585
dnf config-manager --set-enabled codeready-builder-for-ubi-10-$(arch)-rpms
8686

87-
RUN dnf -y --setopt=tsflags=nodocs install \
87+
# Pin glibc-devel to 124 until UBI10 repos publish glibc-gconv-extra 126
88+
# (gcc otherwise pulls glibc-devel 126, which cannot be satisfied yet).
89+
RUN dnf -y --setopt=tsflags=nodocs install glibc-devel-2.39-124.el10_2 && \
90+
dnf -y --setopt=tsflags=nodocs install \
8891
git \
8992
git-lfs \
9093
jq \
@@ -93,7 +96,6 @@ RUN dnf -y --setopt=tsflags=nodocs install \
9396
python3-pip \
9497
python3-requests \
9598
python3-rpm \
96-
rpm-build \
9799
skopeo \
98100
krb5-libs \
99101
krb5-devel \

0 commit comments

Comments
 (0)