From eafaec2a2c095b66abeabfc271cd86c75cf412a4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 30 Jul 2024 15:41:48 -0400 Subject: [PATCH] Correct log statement No labels are being applied here. Co-authored-by: Adam Cmiel --- task/buildah-oci-ta/0.2/buildah-oci-ta.yaml | 2 +- task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml | 2 +- task/buildah-remote/0.2/buildah-remote.yaml | 2 +- task/buildah/0.2/buildah.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml b/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml index 040c10a9ef..5de700e38c 100644 --- a/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml +++ b/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml @@ -546,7 +546,7 @@ spec: container=$(buildah from --pull-never $IMAGE) echo "Injecting sbom files into /root/buildinfo/content_manifests/ of $IMAGE" buildah copy $container sbom-cyclonedx.json sbom-purl.json /root/buildinfo/content_manifests/ - echo "Re-applying base image annotations and labels" + echo "Re-applying base image annotations" buildah config -a org.opencontainers.image.base.name=${base_image_name} -a org.opencontainers.image.base.digest=${base_image_digest} $container BUILDAH_ARGS=() diff --git a/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml index b72d5383f1..d9a41f40b3 100644 --- a/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml +++ b/task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml @@ -617,7 +617,7 @@ spec: container=$(buildah from --pull-never $IMAGE) echo "Injecting sbom files into /root/buildinfo/content_manifests/ of $IMAGE" buildah copy $container sbom-cyclonedx.json sbom-purl.json /root/buildinfo/content_manifests/ - echo "Re-applying base image annotations and labels" + echo "Re-applying base image annotations" buildah config -a org.opencontainers.image.base.name=${base_image_name} -a org.opencontainers.image.base.digest=${base_image_digest} $container BUILDAH_ARGS=() diff --git a/task/buildah-remote/0.2/buildah-remote.yaml b/task/buildah-remote/0.2/buildah-remote.yaml index 58e3ab3277..2ad0dd4866 100644 --- a/task/buildah-remote/0.2/buildah-remote.yaml +++ b/task/buildah-remote/0.2/buildah-remote.yaml @@ -599,7 +599,7 @@ spec: container=$(buildah from --pull-never $IMAGE) echo "Injecting sbom files into /root/buildinfo/content_manifests/ of $IMAGE" buildah copy $container sbom-cyclonedx.json sbom-purl.json /root/buildinfo/content_manifests/ - echo "Re-applying base image annotations and labels" + echo "Re-applying base image annotations" buildah config -a org.opencontainers.image.base.name=${base_image_name} -a org.opencontainers.image.base.digest=${base_image_digest} $container BUILDAH_ARGS=() diff --git a/task/buildah/0.2/buildah.yaml b/task/buildah/0.2/buildah.yaml index e7c1ddec7c..af11cceabf 100644 --- a/task/buildah/0.2/buildah.yaml +++ b/task/buildah/0.2/buildah.yaml @@ -495,7 +495,7 @@ spec: container=$(buildah from --pull-never $IMAGE) echo "Injecting sbom files into /root/buildinfo/content_manifests/ of $IMAGE" buildah copy $container sbom-cyclonedx.json sbom-purl.json /root/buildinfo/content_manifests/ - echo "Re-applying base image annotations and labels" + echo "Re-applying base image annotations" buildah config -a org.opencontainers.image.base.name=${base_image_name} -a org.opencontainers.image.base.digest=${base_image_digest} $container BUILDAH_ARGS=()