diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index 0ddb039aaf..148e7a4df3 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -13,20 +13,6 @@ spec: _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_ - finally: - - name: show-sbom - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - taskRef: - params: - - name: name - value: show-sbom - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7 - - name: kind - value: task - resolver: bundles params: - default: - linux/x86_64 @@ -86,7 +72,7 @@ spec: name: hermetic type: string - default: "" - description: Build dependencies to be prefetched by Cachi2 + description: Build dependencies to be prefetched name: prefetch-input type: string - default: "" @@ -98,6 +84,11 @@ spec: description: Add built image into an OCI image index name: build-image-index type: string + - default: docker + description: The format for the resulting image's mediaType. Valid values are + oci or docker. + name: buildah-format + type: string - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -274,6 +265,10 @@ spec: value: $(params.build-args-file) - name: PRIVILEGED_NESTED value: $(params.privileged-nested) + - name: SOURCE_URL + value: $(tasks.clone-repository.results.url) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -309,6 +304,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -377,7 +374,12 @@ spec: operator: in values: - "false" - - name: clair-scan + - matrix: + params: + - name: image-platform + value: + - $(params.build-platforms) + name: clair-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -399,7 +401,12 @@ spec: operator: in values: - "false" - - name: ecosystem-cert-preflight-checks + - matrix: + params: + - name: platform + value: + - $(params.build-platforms) + name: ecosystem-cert-preflight-checks params: - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL) diff --git a/openshift/ci-operator/knative-images/kn/Dockerfile b/openshift/ci-operator/knative-images/kn/Dockerfile index b4bec1eac7..d575aaba08 100755 --- a/openshift/ci-operator/knative-images/kn/Dockerfile +++ b/openshift/ci-operator/knative-images/kn/Dockerfile @@ -24,8 +24,7 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-client-kn-rhel8-container" \ - cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" \ + com.redhat.component="openshift-serverless-1-kn-client-kn-rhel8-container" \ name="openshift-serverless-1/kn-client-kn-rhel8" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Client Kn" \ @@ -33,6 +32,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Client Kn" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \ io.k8s.description="Red Hat OpenShift Serverless Client Kn" \ - io.openshift.tags="kn" - + io.openshift.tags="kn" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/kn"] diff --git a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile index 6fde577408..bc3e94cf62 100755 --- a/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile +++ b/openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \ io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \ - io.openshift.tags="vendor-knative.dev-serving-test-test-images-grpc-ping" - + io.openshift.tags="vendor-knative.dev-serving-test-test-images-grpc-ping" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/grpc-ping"] diff --git a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile index 010f717af6..f08a014b3d 100755 --- a/openshift/ci-operator/knative-test-images/helloworld/Dockerfile +++ b/openshift/ci-operator/knative-test-images/helloworld/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \ io.k8s.description="Red Hat OpenShift Serverless Client Test Test Images Helloworld" \ - io.openshift.tags="test-test-images-helloworld" - + io.openshift.tags="test-test-images-helloworld" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/helloworld"] diff --git a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile index 0fc5d67133..312d2bb31c 100755 --- a/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \ - io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer" - + io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/servingcontainer"] diff --git a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile index ea758a0e05..4f748eb6ef 100755 --- a/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \ io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \ - io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer" - + io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/sidecarcontainer"]