From 0c3296a318fa0a4f0622b7749cd171f12b8da831 Mon Sep 17 00:00:00 2001
From: Mikhail Klimko <mikhail.klimko@octopus.com>
Date: Tue, 19 Nov 2024 12:14:12 +0300
Subject: [PATCH] fix: get-all-images script

---
 charts/cf-runtime/Chart.yaml | 6 +++---
 scripts/get-all-images.sh    | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml
index 38ef735d..66ed8816 100644
--- a/charts/cf-runtime/Chart.yaml
+++ b/charts/cf-runtime/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 7.1.2
+version: 7.1.3
 keywords:
   - codefresh
   - runner
@@ -17,8 +17,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
   artifacthub.io/changes: |
-    - kind: security
-      description: "Misc security updates (kubectl and codefresh-shell images)"
+    - kind: fixed
+      description: "Fix get-all-images.sh script"
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
diff --git a/scripts/get-all-images.sh b/scripts/get-all-images.sh
index 8ddbdf84..2b1a8232 100755
--- a/scripts/get-all-images.sh
+++ b/scripts/get-all-images.sh
@@ -1,6 +1,8 @@
 MYDIR=$(dirname $0)
 CHARTDIR="${MYDIR}/../charts/cf-runtime"
-VALUESFILE="../charts/cf-runtime/.ci/values-ci.yaml"
+VALUESFILE="${MYDIR}/../charts/cf-runtime/.ci/values-ci.yaml"
 OUTPUTFILE=$1
 helm dependency update $CHARTDIR
-helm template --values $VALUESFILE --set global.runtimeName="dummy" $CHARTDIR | grep -E 'image: | dindImage:' | awk -F ': ' '{print $2}' | tr -d '"' | uniq > $OUTPUTFILE
\ No newline at end of file
+helm template --values $VALUESFILE --set global.runtimeName="dummy" $CHARTDIR | grep -E 'image: | dindImage:' | awk -F ': ' '{print $2}' | tr -d '"' | tr -d "'" | uniq > $OUTPUTFILE
+
+cat $OUTPUTFILE | tr '@' '\n' | awk 'NR % 2 == 1' | tee $OUTPUTFILE