Skip to content

Commit bc9ba8a

Browse files
fix: enable cross-platform vendor stages for buildah 0.10 arm64 builds
Add explicit linux/amd64 platform to vendor COPY stages and bump Konflux task references (including buildah-remote-oci-ta 0.10) so MintMaker #781 can land once konflux-build-cli cross-platform support is available. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 586cbe7 commit bc9ba8a

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

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

Lines changed: 8 additions & 8 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
@@ -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:7e84b01526b6a50b920c0f456c8d95d6c5c2f7b81109ea772e1dcf7aba14bfa5
201201
- name: kind
202202
value: task
203203
resolver: bundles
@@ -238,7 +238,7 @@ spec:
238238
- name: name
239239
value: buildah-remote-oci-ta
240240
- name: bundle
241-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
241+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:1eaac50bb7e77feccfe3f0a521714de6a153387d3847bd94542e2a974bb05121
242242
- name: kind
243243
value: task
244244
resolver: bundles
@@ -281,7 +281,7 @@ spec:
281281
- name: name
282282
value: source-build-oci-ta
283283
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
284+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:8567bb7bf8fa9147c96b297533336fa7079ecf972cb86c09ccdd6bddedb25711
285285
- name: kind
286286
value: task
287287
resolver: bundles
@@ -354,7 +354,7 @@ spec:
354354
- name: name
355355
value: sast-snyk-check
356356
- name: bundle
357-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:566753ca880764361b11f2c67d8e62dda94f829b11cb48e4716f27568216a481
357+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:2a61c29aacfb9dfe68c114eb17caa2714af2f734c94ee3ad0c236f198b54809b
358358
- name: kind
359359
value: task
360360
resolver: bundles
@@ -381,7 +381,7 @@ spec:
381381
- name: name
382382
value: sast-shell-check
383383
- name: bundle
384-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:2cd09c97b9f0fae9c7bcd26d956f77221fb7137ee8b2ef17e7351b5e6f1eb89e
384+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:f0fb21cf7028224146d4ab4f42395c9f03b99f1d93720745e07f97d146d1f897
385385
- name: kind
386386
value: task
387387
resolver: bundles
@@ -408,7 +408,7 @@ spec:
408408
- name: name
409409
value: sast-unicode-check
410410
- name: bundle
411-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:c162d9d0cd1e4c64dfc340577ba8e6bf55ebd1bb859fe3157217de9b4473c640
411+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:633cf558e850517b9e2891af4ccb34f6b3ba249613693130ca130a541a5a70ff
412412
- name: kind
413413
value: task
414414
resolver: bundles
@@ -460,7 +460,7 @@ spec:
460460
- name: name
461461
value: rpms-signature-scan
462462
- name: bundle
463-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
463+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a542b5a0e7dd76521d85222c22a122ba7bda8517033df7b3aa1da1ff7028f798
464464
- name: kind
465465
value: task
466466
resolver: bundles

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

Lines changed: 8 additions & 8 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
@@ -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:7e84b01526b6a50b920c0f456c8d95d6c5c2f7b81109ea772e1dcf7aba14bfa5
194194
- name: kind
195195
value: task
196196
resolver: bundles
@@ -231,7 +231,7 @@ spec:
231231
- name: name
232232
value: buildah-remote-oci-ta
233233
- name: bundle
234-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
234+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.10@sha256:1eaac50bb7e77feccfe3f0a521714de6a153387d3847bd94542e2a974bb05121
235235
- name: kind
236236
value: task
237237
resolver: bundles
@@ -274,7 +274,7 @@ spec:
274274
- name: name
275275
value: source-build-oci-ta
276276
- name: bundle
277-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
277+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:8567bb7bf8fa9147c96b297533336fa7079ecf972cb86c09ccdd6bddedb25711
278278
- name: kind
279279
value: task
280280
resolver: bundles
@@ -347,7 +347,7 @@ spec:
347347
- name: name
348348
value: sast-snyk-check
349349
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:566753ca880764361b11f2c67d8e62dda94f829b11cb48e4716f27568216a481
350+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.5@sha256:2a61c29aacfb9dfe68c114eb17caa2714af2f734c94ee3ad0c236f198b54809b
351351
- name: kind
352352
value: task
353353
resolver: bundles
@@ -374,7 +374,7 @@ spec:
374374
- name: name
375375
value: sast-shell-check
376376
- name: bundle
377-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:2cd09c97b9f0fae9c7bcd26d956f77221fb7137ee8b2ef17e7351b5e6f1eb89e
377+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:f0fb21cf7028224146d4ab4f42395c9f03b99f1d93720745e07f97d146d1f897
378378
- name: kind
379379
value: task
380380
resolver: bundles
@@ -401,7 +401,7 @@ spec:
401401
- name: name
402402
value: sast-unicode-check
403403
- name: bundle
404-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:c162d9d0cd1e4c64dfc340577ba8e6bf55ebd1bb859fe3157217de9b4473c640
404+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.4@sha256:633cf558e850517b9e2891af4ccb34f6b3ba249613693130ca130a541a5a70ff
405405
- name: kind
406406
value: task
407407
resolver: bundles
@@ -453,7 +453,7 @@ spec:
453453
- name: name
454454
value: rpms-signature-scan
455455
- name: bundle
456-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:41720da9dfe26f33b0bdc46bbf8667a27dae4790d8e5c5f4412224658de7b213
456+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a542b5a0e7dd76521d85222c22a122ba7bda8517033df7b3aa1da1ff7028f798
457457
- name: kind
458458
value: task
459459
resolver: bundles

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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

99
FROM registry.access.redhat.com/ubi10/ubi:10.2-1780550529
1010

0 commit comments

Comments
 (0)