From 19ba5174b4b2c2bc0348640d2493577202335244 Mon Sep 17 00:00:00 2001
From: Angel Misevski <amisevsk@redhat.com>
Date: Mon, 25 Nov 2019 13:27:45 -0500
Subject: [PATCH 1/3] Fix caching of images when multiple images specified

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
---
 build/scripts/cache_images.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/scripts/cache_images.sh b/build/scripts/cache_images.sh
index f67db9b18..87549b330 100755
--- a/build/scripts/cache_images.sh
+++ b/build/scripts/cache_images.sh
@@ -27,7 +27,7 @@ images=$(yq -S -r '.icon' "${metas[@]}" | sort | uniq)
 mkdir -p "$RESOURCES_DIR" "$TEMP_DIR"
 
 echo "Caching images referenced in devfiles"
-for image in "${images[@]}"; do
+while read -r image; do
   # Workaround for getting filenames through content-disposition: copy to temp
   # dir and read filename before moving to /resources.
   wget -P "${TEMP_DIR}" -nv --content-disposition "${image}"
@@ -47,6 +47,6 @@ for image in "${images[@]}"; do
   cached_url="{{ DEVFILE_REGISTRY_URL }}/${cached_image#/}"
   sed -i "s|${image}|${cached_url}|g" "${metas[@]}" "$INDEX_JSON"
   echo "  Updated devfiles to point at cached image"
-done
+done <<< "$images"
 
 rm -rf "$TEMP_DIR"

From 3c68339ca91a887f1bd835f9ca580a174b96677e Mon Sep 17 00:00:00 2001
From: Angel Misevski <amisevsk@redhat.com>
Date: Tue, 26 Nov 2019 10:19:42 -0500
Subject: [PATCH 2/3] Remove query parameters from filename when saving devfile
 icon

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
---
 build/scripts/cache_images.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/cache_images.sh b/build/scripts/cache_images.sh
index 87549b330..58136784f 100755
--- a/build/scripts/cache_images.sh
+++ b/build/scripts/cache_images.sh
@@ -40,7 +40,7 @@ while read -r image; do
   image_dir="${RESOURCES_DIR%/}/${image_dir%/*}"
   mkdir -p "$image_dir"
 
-  cached_image="${image_dir%/}/${filename}"
+  cached_image="${image_dir%/}/${filename%\?*}"
   mv "$file" "$cached_image"
   echo "  Downloaded image $image to $cached_image"
 

From 2c34856ffe87b0546e79484644ead825980e8fbe Mon Sep 17 00:00:00 2001
From: Angel Misevski <amisevsk@redhat.com>
Date: Mon, 2 Dec 2019 17:14:10 -0500
Subject: [PATCH 3/3] Strip query and fragment components from cached image
 names in offline

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
---
 build/scripts/cache_images.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/scripts/cache_images.sh b/build/scripts/cache_images.sh
index 58136784f..b4b57f0f2 100755
--- a/build/scripts/cache_images.sh
+++ b/build/scripts/cache_images.sh
@@ -40,7 +40,9 @@ while read -r image; do
   image_dir="${RESOURCES_DIR%/}/${image_dir%/*}"
   mkdir -p "$image_dir"
 
-  cached_image="${image_dir%/}/${filename%\?*}"
+  # Strip query and fragment components from image URL
+  cached_image="${image_dir%/}/${filename%%\?*}"
+  cached_image="${cached_image%%\#*}"
   mv "$file" "$cached_image"
   echo "  Downloaded image $image to $cached_image"