From 048ba8ca28ba86ee0e53f3ac5db03f81965894f1 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Fri, 20 Dec 2024 12:25:49 +0100 Subject: [PATCH] Removing the command able to copy the sbom-purl.json as we don't generate this file anymore Signed-off-by: cmoulliard --- .../0.1/build-paketo-builder-oci-ta.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/task/build-paketo-builder-oci-ta/0.1/build-paketo-builder-oci-ta.yaml b/task/build-paketo-builder-oci-ta/0.1/build-paketo-builder-oci-ta.yaml index de906aa7c0..3e0afbc956 100644 --- a/task/build-paketo-builder-oci-ta/0.1/build-paketo-builder-oci-ta.yaml +++ b/task/build-paketo-builder-oci-ta/0.1/build-paketo-builder-oci-ta.yaml @@ -335,7 +335,6 @@ spec: export IMAGE fi - echo "Merging contents of sbom-source.json and sbom-image.json into sbom-cyclonedx.json" python3 /scripts/merge_syft_sboms.py @@ -380,16 +379,12 @@ spec: update-ca-trust fi - echo "Pull the image from the OCI storage." buildah --storage-driver "$STORAGE_DRIVER" pull "$IMAGE" - echo "Copy within the container of the image the sbom files" - container=$(buildah --storage-driver "$STORAGE_DRIVER" from --pull-never "$IMAGE") - buildah --storage-driver "$STORAGE_DRIVER" copy "$container" sbom-cyclonedx.json sbom-purl.json /root/buildinfo/content_manifests/ BUILDAH_ARGS=() if [ "${SQUASH}" == "true" ]; then @@ -398,7 +393,6 @@ spec: buildah --storage-driver "$STORAGE_DRIVER" commit "${BUILDAH_ARGS[@]}" "$container" "$IMAGE" - echo "Pushing to ${IMAGE%:*}:${TASKRUN_NAME}" retries=5 @@ -412,7 +406,6 @@ spec: exit 1 fi - echo "Pushing to ${IMAGE}" if ! buildah push \ @@ -425,7 +418,6 @@ spec: exit 1 fi - echo "Save the different results" tee "$(results.IMAGE_DIGEST.path)" < "/var/workdir/image-digest"