fix: address review comments

Signed-off-by: Chenxiong Qi <[email protected]>
konflux-ci · Jul 11, 2024 · b5dd706 · b5dd706
1 parent 1d41c5a
commit b5dd706
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/task/build-image-manifest/0.1/build-image-manifest.yaml b/task/build-image-manifest/0.1/build-image-manifest.yaml
@@ -114,7 +114,7 @@ spec:
       suffix=".dockerfile"
       image_without_tag=${IMAGE%:*}
       # remove the potential existing newline
-      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
       dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
       artifact_type=application/vnd.konflux.dockerfile
 
@@ -130,7 +130,7 @@ spec:
       # Do not assume the actual file name. Generally, it could be Dockerfile or Containerfile.
       cd "$output_dir"
       n=1
-      find . -type f | while read filename; do
+      find . -type f | while read -r filename; do
         if [ $n -gt 1 ]; then
           echo "Multiple container files exist in the dockerfile image." >&2
           ls >&2

diff --git a/task/buildah-oci-ta/0.1/buildah-oci-ta.yaml b/task/buildah-oci-ta/0.1/buildah-oci-ta.yaml
@@ -559,7 +559,7 @@ spec:
         suffix=".dockerfile"
         image_without_tag=${IMAGE%:*}
         # remove the potential existing newline
-        manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+        manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
         dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
         artifact_type=application/vnd.konflux.dockerfile
 

diff --git a/task/buildah-remote-oci-ta/0.1/buildah-remote-oci-ta.yaml b/task/buildah-remote-oci-ta/0.1/buildah-remote-oci-ta.yaml
@@ -635,7 +635,7 @@ spec:
       suffix=".dockerfile"
       image_without_tag=${IMAGE%:*}
       # remove the potential existing newline
-      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
       dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
       artifact_type=application/vnd.konflux.dockerfile
 

diff --git a/task/buildah-remote/0.1/buildah-remote.yaml b/task/buildah-remote/0.1/buildah-remote.yaml
@@ -632,7 +632,7 @@ spec:
       suffix=".dockerfile"
       image_without_tag=${IMAGE%:*}
       # remove the potential existing newline
-      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
       dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
       artifact_type=application/vnd.konflux.dockerfile
 

diff --git a/task/buildah-rhtap/0.1/buildah-rhtap.yaml b/task/buildah-rhtap/0.1/buildah-rhtap.yaml
@@ -229,7 +229,7 @@ spec:
       suffix=".dockerfile"
       image_without_tag=${IMAGE%:*}
       # remove the potential existing newline
-      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
       dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
       artifact_type=application/vnd.konflux.dockerfile
 

diff --git a/task/buildah/0.1/buildah.yaml b/task/buildah/0.1/buildah.yaml
@@ -536,7 +536,7 @@ spec:
       suffix=".dockerfile"
       image_without_tag=${IMAGE%:*}
       # remove the potential existing newline
-      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}" | tr -d '\r\n')
+      manifest_digest=$(cat "${IMAGE_DIGEST_FILE}")
       dockerfile_image=${image_without_tag}:${manifest_digest/:/-}${suffix}
       artifact_type=application/vnd.konflux.dockerfile