From abe1ba5dcd63453cf3b0cbe973d0fd2eb8fde37a Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Fri, 6 Dec 2024 10:15:24 +0100 Subject: [PATCH] Removing some additional comments Signed-off-by: cmoulliard --- .../0.1/build-paketo-builder-oci-ta.yaml | 7 ------- 1 file changed, 7 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 d4156f821f..5fd88417eb 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 @@ -326,7 +326,6 @@ spec: echo "##########################################################################################" echo "### Running syft on the image filesystem" echo "##########################################################################################" - # syft dir:"$(cat /shared/container_path)" --output cyclonedx-json="/var/workdir/sbom-image.json" syft scan oci-dir:/shared/konflux-final-image -o cyclonedx-json > /var/workdir/sbom-image.json volumeMounts: - mountPath: /shared @@ -413,15 +412,9 @@ spec: echo "##########################################################################################" echo "## Copy within the container of the image the sbom files" echo "##########################################################################################" - #base_image_name=$(buildah inspect --format '{{ index .ImageAnnotations "org.opencontainers.image.base.name"}}' $IMAGE | cut -f1 -d'@') - #base_image_digest=$(buildah inspect --format '{{ index .ImageAnnotations "org.opencontainers.image.base.digest"}}' $IMAGE) - 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/ - # The image build don't include "ImageAnnotations" as "null" - #buildah config -a org.opencontainers.image.base.name=${base_image_name} -a org.opencontainers.image.base.digest=${base_image_digest} $container - BUILDAH_ARGS=() if [ "${SQUASH}" == "true" ]; then BUILDAH_ARGS+=("--squash")