Skip to content

Commit b8e8fac

Browse files
committed
Switch build-container to tkn-bundle-oci-ta
`tkn-bundle-oci-ta` is the one which builds and pushes tasks bundle as OCI artifact. https://github.com/konflux-ci/build-definitions/tree/main/task/tkn-bundle-oci-ta/0.1
1 parent 97f54c7 commit b8e8fac

File tree

2 files changed

+5
-66
lines changed

2 files changed

+5
-66
lines changed

.tekton/acs-konflux-tasks-push.yaml

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ spec:
2828
value: '{{revision}}'
2929
- name: output-image
3030
value: quay.io/redhat-user-workloads/rh-acs-tenant/acs-konflux-tasks:rev-{{revision}}
31-
- name: image-expires-after
32-
value: '106w'
33-
- name: dockerfile
34-
value: Dockerfile
3531
- name: rebuild
3632
value: "true"
3733
- name: build-source-image
3834
value: "true"
35+
- name: path-context
36+
value: tasks
3937

4038
workspaces:
4139
- name: git-auth
@@ -60,11 +58,6 @@ spec:
6058
to build image.
6159
name: path-context
6260
type: string
63-
- default: Dockerfile
64-
description: Path to the Dockerfile inside the context specified by parameter
65-
path-context
66-
name: dockerfile
67-
type: string
6861
- default: "false"
6962
description: Force rebuild image
7063
name: rebuild
@@ -73,10 +66,6 @@ spec:
7366
description: Skip checks against built image
7467
name: skip-checks
7568
type: string
76-
- default: "false"
77-
description: Execute the build with network isolation
78-
name: hermetic
79-
type: string
8069
- default: ""
8170
description: Build dependencies to be prefetched by Cachi2
8271
name: prefetch-input
@@ -93,14 +82,6 @@ spec:
9382
description: Add built image into an OCI image index
9483
name: build-image-index
9584
type: string
96-
- default: [ ]
97-
description: Array of --build-arg values ("arg=value" strings) for buildah
98-
name: build-args
99-
type: array
100-
- default: ""
101-
description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
102-
name: build-args-file
103-
type: string
10485
- default: "1d"
10586
description: This sets the expiration time for intermediate OCI artifacts produced and used during builds after which they can be garbage collected.
10687
name: oci-artifact-expires-after
@@ -238,33 +219,16 @@ spec:
238219
params:
239220
- name: IMAGE
240221
value: $(params.output-image)
241-
- name: DOCKERFILE
242-
value: $(params.dockerfile)
243222
- name: CONTEXT
244223
value: $(params.path-context)
245-
- name: HERMETIC
246-
value: $(params.hermetic)
247-
- name: PREFETCH_INPUT
248-
value: $(params.prefetch-input)
249-
- name: IMAGE_EXPIRES_AFTER
250-
value: $(params.image-expires-after)
251-
- name: COMMIT_SHA
252-
value: $(tasks.clone-repository.results.commit)
253-
- name: BUILD_ARGS
254-
value:
255-
- $(params.build-args[*])
256-
- name: BUILD_ARGS_FILE
257-
value: $(params.build-args-file)
258224
- name: SOURCE_ARTIFACT
259225
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
260-
- name: CACHI2_ARTIFACT
261-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
262226
taskRef:
263227
params:
264228
- name: name
265-
value: buildah-oci-ta
229+
value: tkn-bundle-oci-ta
266230
- name: bundle
267-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:33cc4005cb06a865676d523fa92a0312466c688fc4c98993700e42f2034efc75
231+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.1@sha256:b4b457d18a01348bd3d7d19b0ce05754c739efb2eb44be602c3050ed99c31a21
268232
- name: kind
269233
value: task
270234
resolver: bundles
@@ -285,7 +249,7 @@ spec:
285249
value: $(params.build-image-index)
286250
- name: IMAGES
287251
value:
288-
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
252+
- $(tasks.build-container.results.IMAGE_REF)
289253
taskRef:
290254
params:
291255
- name: name
@@ -538,28 +502,6 @@ spec:
538502
value: task
539503
resolver: bundles
540504

541-
- name: push-dockerfile
542-
params:
543-
- name: IMAGE
544-
value: $(tasks.build-image-index.results.IMAGE_URL)
545-
- name: IMAGE_DIGEST
546-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
547-
- name: DOCKERFILE
548-
value: $(params.dockerfile)
549-
- name: CONTEXT
550-
value: $(params.path-context)
551-
- name: SOURCE_ARTIFACT
552-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
553-
taskRef:
554-
params:
555-
- name: name
556-
value: push-dockerfile-oci-ta
557-
- name: bundle
558-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08ef41d6a98608bd5f1de75d77f015f520911a278d1875e174b88b9d04db2441
559-
- name: kind
560-
value: task
561-
resolver: bundles
562-
563505
- name: rpms-signature-scan
564506
params:
565507
- name: image-url

Dockerfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)