Skip to content

Commit

Permalink
Removing some additional comments
Browse files Browse the repository at this point in the history
Signed-off-by: cmoulliard <[email protected]>
  • Loading branch information
cmoulliard committed Dec 9, 2024
1 parent c3f7651 commit abe1ba5
Showing 1 changed file with 0 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit abe1ba5

Please sign in to comment.