From e28106062b7d70e4e97b84811ae15c63f8c8a4c3 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-DU3GL6Q.localdomain>
Date: Wed, 23 Mar 2022 10:22:33 +0200
Subject: [PATCH 01/43] [Minor][EL-263]add dep

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 52de95b..4fa3545 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,9 @@ RUN apk add --update \
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
     helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
+# Install python library
+RUN pip install ruamel.yaml
+
 # Install helmfile
 
 ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
@@ -32,4 +35,4 @@ LABEL helmdiff="${HELM_DIFF_VERSION}"
 
 COPY lib/helmfile.py /helmfile.py
 
-ENTRYPOINT ["python3", "/helmfile.py"]
\ No newline at end of file
+ENTRYPOINT ["python3", "/helmfile.py"]

From b2da30d9428f90d8c637a5f79f58ca91a6d01b0b Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-DU3GL6Q.localdomain>
Date: Wed, 23 Mar 2022 10:37:06 +0200
Subject: [PATCH 02/43] [Minor][EL-263]add dep

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 4fa3545..ea57706 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,7 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
     helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library
+RUN pip install --upgrade pip
 RUN pip install ruamel.yaml
 
 # Install helmfile

From 14556eae613babd67dc80d3dc81b192698bc5656 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-DU3GL6Q.localdomain>
Date: Wed, 23 Mar 2022 10:44:55 +0200
Subject: [PATCH 03/43] [Minor][EL-263]add dep

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index ea57706..650d854 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
 
 # Install python library
 RUN pip install --upgrade pip
+RUN pip install -U setuptools
 RUN pip install ruamel.yaml
 
 # Install helmfile

From 574f1633b2cdfb918dc5a665862fd801aacb7450 Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-DU3GL6Q.localdomain>
Date: Wed, 23 Mar 2022 10:53:50 +0200
Subject: [PATCH 04/43] [Minor][EL-263]add dep

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 650d854..55cc76e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,8 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
     helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library
-RUN pip install --upgrade pip
-RUN pip install -U setuptools
-RUN pip install ruamel.yaml
+RUN python3 -m pip install --upgrade pip
+RUN python3 -m pip install ruamel.yaml
 
 # Install helmfile
 

From 2edc6b742023f3af2cf8ff5152d9d5198935aff3 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 10:07:01 +0300
Subject: [PATCH 05/43] new helm builds versions support

---
 codefresh.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/codefresh.yml b/codefresh.yml
index 7684438..290d7c6 100644
--- a/codefresh.yml
+++ b/codefresh.yml
@@ -68,6 +68,18 @@ steps:
           - HELMFILE_VERSION=${{HELMFILE_VERSION}}
           - HELM_DIFF_VERSION=3.1.1
           - HELM_SECRETS_VERSION=${{HELM_SECRETS_VERSION}}
+      BuildingDockerImageHelmBede:
+        title: Building Docker Image
+        type: build
+        image_name: codefreshplugins/cfstep-helmfile
+        working_directory: ./
+        dockerfile: Dockerfile
+        tag: build-${{HELM_VERSION}}-${{HELMFILE_VERSION}}
+        build_arguments:
+          - HELM_VERSION=${{HELM_VERSION}}
+          - HELMFILE_VERSION=${{HELMFILE_VERSION}}
+          - HELM_DIFF_VERSION=${{HELM_DIFF_VERSION}}
+          - HELM_SECRETS_VERSION=${{HELM_SECRETS_VERSION}}
   Push:
     type: parallel
     steps:
@@ -126,3 +138,14 @@ steps:
           branch:
             only:
               - master
+      PushingHelmBedeToDockerRegistry:
+        title: Pushing to Docker Registry
+        type: push
+        candidate: ${{BuildingDockerImageHelmBede}}
+        tags:
+          - ${{HELM_VERSION}}-${{HELMFILE_VERSION}}
+        registry: dockerhub
+        when:
+          branch:
+            only:
+              - master

From 82732da231040f2fd8120c5978f2b9b7c9bc04a6 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:08:53 +0300
Subject: [PATCH 06/43] Add gcc dep

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 55cc76e..1cf6f26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,9 @@ RUN apk add --update \
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
     helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
+# Install deps
+RUN python3 -m pip install --upgrade pip
+
 # Install python library
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install ruamel.yaml

From 5effdfd4f2e954e4b7d428e70c30dc84139aba19 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:19:59 +0300
Subject: [PATCH 07/43] fixes

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1cf6f26..2c09820 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ ARG PYTHON_VERSION
 RUN apk add --update \
     linux-headers \
     git \
+    gcc \
     python3 && \
     rm -rf /var/cache/apk/*
 
@@ -21,9 +22,6 @@ RUN apk add --update \
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
     helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
-# Install deps
-RUN python3 -m pip install --upgrade pip
-
 # Install python library
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install ruamel.yaml

From 56baa049decc404fe6f014c9e9b05896a7abc7c0 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:25:10 +0300
Subject: [PATCH 08/43] fixes

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 2c09820..78b06b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apk add --update \
     linux-headers \
     git \
     gcc \
+    build-base \
     python3 && \
     rm -rf /var/cache/apk/*
 

From 855db5411c2873635854e2b0dbdc14464bc96a9f Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:33:06 +0300
Subject: [PATCH 09/43] fixes

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 78b06b8..49246d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
 
 # Install python library
 RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install ruamel.yaml
+# RUN python3 -m pip install ruamel.yaml
 
 # Install helmfile
 

From d0d8a8d2f2690332311f434eb3872b334888b968 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:34:08 +0300
Subject: [PATCH 10/43] fixes

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 49246d1..5fcc131 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,8 @@ RUN apk add --update \
     git \
     gcc \
     build-base \
+    libc-dev \
+    musl-dev \
     python3 && \
     rm -rf /var/cache/apk/*
 
@@ -25,7 +27,7 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
 
 # Install python library
 RUN python3 -m pip install --upgrade pip
-# RUN python3 -m pip install ruamel.yaml
+RUN python3 -m pip install ruamel.yaml
 
 # Install helmfile
 

From f9ea686f27fd9125fbd0115646b8313e7cd547f5 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:40:04 +0300
Subject: [PATCH 11/43] fixes

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 5fcc131..f3d3c7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ RUN apk add --update \
     build-base \
     libc-dev \
     musl-dev \
+    python-devel \
     python3 && \
     rm -rf /var/cache/apk/*
 

From f454084e82cdab8a7621c43d30d0f4728e225e3b Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 11:44:20 +0300
Subject: [PATCH 12/43] fixes

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f3d3c7a..25d6e90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apk add --update \
     build-base \
     libc-dev \
     musl-dev \
-    python-devel \
+    python3-dev \
     python3 && \
     rm -rf /var/cache/apk/*
 

From d5c449d3ce76911def5cf58e19ecab9b492a3185 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 12:07:49 +0300
Subject: [PATCH 13/43] fixes

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 25d6e90..c359e93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,8 @@ RUN apk add --update \
 
 # Install helmfile plugin deps
 
-RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
-    helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
+# RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
+RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From eea22d8f343be846cbd91885ed35b1cd34bd8420 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 12:22:09 +0300
Subject: [PATCH 14/43] fixes

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c359e93..e9cc325 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --update \
 # Install helmfile plugin deps
 
 # RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
-RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
+# RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From 3cff61b9c8f50806510f7a40194399c82f6e80ca Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 12:46:06 +0300
Subject: [PATCH 15/43] fixes

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e9cc325..19e3ff9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,8 @@ RUN apk add --update \
 
 # Install helmfile plugin deps
 
-# RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
+#RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
+RUN helm plugin install https://github.com/databus23/helm-diff
 # RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From 545124df09343265781918c1503dbc165d5158cc Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 13:05:31 +0300
Subject: [PATCH 16/43] testing

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 19e3ff9..4bc718e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,8 @@ RUN apk add --update \
 
 # Install helmfile plugin deps
 
-#RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
-RUN helm plugin install https://github.com/databus23/helm-diff
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
+    rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-d
 # RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From 2c53e9ac9892607fbff1cc7f75a6005e078f7bcd Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 13:11:21 +0300
Subject: [PATCH 17/43] testing

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4bc718e..b33e273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --update \
 # Install helmfile plugin deps
 
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
-    rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-d
+    rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff
 # RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From bc2feaf7adc6ee72d618f9eb0cf38f22d3588cb9 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 13:17:49 +0300
Subject: [PATCH 18/43] testing

---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b33e273..5017c0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,11 @@ RUN apk add --update \
 
 # Install helmfile plugin deps
 
-RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
-    rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff
+RUN ls -al /root/.helm/helm/plugins/
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
+RUN ls -al /root/.helm/helm/plugins/
+RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff
+RUN ls -al /root/.helm/helm/plugins/
 # RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From 6edb90eaf24a29c8700279ae9de94c44bc610d16 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 13:28:41 +0300
Subject: [PATCH 19/43] testing

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5017c0e..5e3c308 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,12 +23,11 @@ RUN apk add --update \
 
 # Install helmfile plugin deps
 
-RUN ls -al /root/.helm/helm/plugins/
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
-RUN ls -al /root/.helm/helm/plugins/
+# I have no idea why but that is need otherwise
+# diff plugin doesn't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff
-RUN ls -al /root/.helm/helm/plugins/
-# RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
+RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From 5946751f7409afd9670d002f728c31ea08d1fd02 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Wed, 6 Apr 2022 14:08:00 +0300
Subject: [PATCH 20/43] remove

---
 codefresh.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/codefresh.yml b/codefresh.yml
index 290d7c6..7684438 100644
--- a/codefresh.yml
+++ b/codefresh.yml
@@ -68,18 +68,6 @@ steps:
           - HELMFILE_VERSION=${{HELMFILE_VERSION}}
           - HELM_DIFF_VERSION=3.1.1
           - HELM_SECRETS_VERSION=${{HELM_SECRETS_VERSION}}
-      BuildingDockerImageHelmBede:
-        title: Building Docker Image
-        type: build
-        image_name: codefreshplugins/cfstep-helmfile
-        working_directory: ./
-        dockerfile: Dockerfile
-        tag: build-${{HELM_VERSION}}-${{HELMFILE_VERSION}}
-        build_arguments:
-          - HELM_VERSION=${{HELM_VERSION}}
-          - HELMFILE_VERSION=${{HELMFILE_VERSION}}
-          - HELM_DIFF_VERSION=${{HELM_DIFF_VERSION}}
-          - HELM_SECRETS_VERSION=${{HELM_SECRETS_VERSION}}
   Push:
     type: parallel
     steps:
@@ -138,14 +126,3 @@ steps:
           branch:
             only:
               - master
-      PushingHelmBedeToDockerRegistry:
-        title: Pushing to Docker Registry
-        type: push
-        candidate: ${{BuildingDockerImageHelmBede}}
-        tags:
-          - ${{HELM_VERSION}}-${{HELMFILE_VERSION}}
-        registry: dockerhub
-        when:
-          branch:
-            only:
-              - master

From 99c9ddddd54b4842ca43b6aafc3ce7029fed5c5b Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Fri, 8 Apr 2022 15:41:46 +0300
Subject: [PATCH 21/43] Fix helm secrets plugin

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e3c308..dc72a6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,8 @@ RUN apk add --update \
 
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 # I have no idea why but that is need otherwise
-# diff plugin doesn't work
-RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff
+# diff and secrets plugin don't work
+RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From 40cd530c11c2fa93a7b2e07e66132ccb5e7715c9 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Fri, 8 Apr 2022 16:03:12 +0300
Subject: [PATCH 22/43] Fix helm secrets plugin

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index dc72a6b..e3d627b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,7 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
+RUN ls /root/.helm/helm/plugins/
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 
 # Install python library

From e6e624e26bb165dd11d51ff68934c82c19bed0a2 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Fri, 8 Apr 2022 16:07:04 +0300
Subject: [PATCH 23/43] Fix helm secrets plugin

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e3d627b..e7e15f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,8 @@ RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
-RUN ls /root/.helm/helm/plugins/
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
+RUN ls /root/.helm/helm/plugins/
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From 07a92bb46adae4d7d413c6ead7c03a091f71d900 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Fri, 8 Apr 2022 16:10:55 +0300
Subject: [PATCH 24/43] Fix helm secrets plugin

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e7e15f7..d6ceb03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,11 +24,10 @@ RUN apk add --update \
 # Install helmfile plugin deps
 
 RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
+RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
-RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
-RUN ls /root/.helm/helm/plugins/
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From c75602517f5aedac018ff5e274e87f7e9cfd7540 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 13:49:28 +0300
Subject: [PATCH 25/43] Add azure cli

---
 Dockerfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d6ceb03..6630c55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,12 @@ RUN apk add --update \
     libc-dev \
     musl-dev \
     python3-dev \
-    python3 && \
+    python3 \
+    ca-certificates \
+    curl \
+    apt-transport-https \
+    lsb-release \
+    gnupg && \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps
@@ -38,6 +43,13 @@ RUN python3 -m pip install ruamel.yaml
 ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
 RUN chmod 0755 /bin/helmfile
 
+# Install az cli
+ADD curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
+ADD AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
+
+RUN apk add --update \
+    azure-cli
+
 LABEL helm="${HELM_VERSION}"
 LABEL helmfile="${HELMFILE_VERSION}"
 LABEL helmdiff="${HELM_DIFF_VERSION}"

From 362ca56a4ccf86bb745f405e202310fac78929b0 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:00:08 +0300
Subject: [PATCH 26/43] test

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6630c55..7753f18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,6 @@ RUN apk add --update \
     ca-certificates \
     curl \
     apt-transport-https \
-    lsb-release \
     gnupg && \
     rm -rf /var/cache/apk/*
 

From e984b340bc6604c4daa364e410e8fa60a13c0d0f Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:04:31 +0300
Subject: [PATCH 27/43] test

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7753f18..1519c55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,6 @@ RUN apk add --update \
     python3 \
     ca-certificates \
     curl \
-    apt-transport-https \
     gnupg && \
     rm -rf /var/cache/apk/*
 

From a483217b65a92929c72f7c36fc8fef86e91fd09f Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:13:43 +0300
Subject: [PATCH 28/43] test

---
 Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1519c55..2b5518b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,7 @@ RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.
 # Install python library
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install ruamel.yaml
+RUN python3 -m pip install azure-cli
 
 # Install helmfile
 
@@ -42,11 +43,11 @@ ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/he
 RUN chmod 0755 /bin/helmfile
 
 # Install az cli
-ADD curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
-ADD AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
-
-RUN apk add --update \
-    azure-cli
+#ADD curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
+#ADD AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
+#
+#RUN apk add --update \
+#    azure-cli
 
 LABEL helm="${HELM_VERSION}"
 LABEL helmfile="${HELMFILE_VERSION}"

From c5b3a139e7001b4d6636ca882f5a6eaba06350bb Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:33:46 +0300
Subject: [PATCH 29/43] test

---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b5518b..8d5cf6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,6 @@ RUN apk add --update \
     python3-dev \
     python3 \
     ca-certificates \
-    curl \
     gnupg && \
     rm -rf /var/cache/apk/*
 
@@ -43,11 +42,9 @@ ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/he
 RUN chmod 0755 /bin/helmfile
 
 # Install az cli
-#ADD curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
-#ADD AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
-#
-#RUN apk add --update \
-#    azure-cli
+#RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
+#RUN AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
+RUN curl -L https://aka.ms/InstallAzureCli | bash
 
 LABEL helm="${HELM_VERSION}"
 LABEL helmfile="${HELMFILE_VERSION}"

From 7b64e3dc51dc1c3adc0f6474e1e849bf42138397 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:39:28 +0300
Subject: [PATCH 30/43] test

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 8d5cf6d..1125b88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ RUN apk add --update \
     python3-dev \
     python3 \
     ca-certificates \
+    libffi-dev \
     gnupg && \
     rm -rf /var/cache/apk/*
 

From 26ed8986911dfbbd7562668636f9955f5447d1a7 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 14:57:05 +0300
Subject: [PATCH 31/43] test

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1125b88..a8569c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ RUN chmod 0755 /bin/helmfile
 # Install az cli
 #RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
 #RUN AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
-RUN curl -L https://aka.ms/InstallAzureCli | bash
+#RUN curl -L https://aka.ms/InstallAzureCli | bash
 
 LABEL helm="${HELM_VERSION}"
 LABEL helmfile="${HELMFILE_VERSION}"

From ba65d06066f10cd7b54199a08cb1a12d46186353 Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 18:13:35 +0300
Subject: [PATCH 32/43] Remove old stuff

---
 Dockerfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8569c7..00dcd7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,11 +42,6 @@ RUN python3 -m pip install azure-cli
 ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
 RUN chmod 0755 /bin/helmfile
 
-# Install az cli
-#RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
-#RUN AZ_REPO=$(lsb_release -cs) && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | sudo tee /etc/apt/sources.list.d/azure-cli.list
-#RUN curl -L https://aka.ms/InstallAzureCli | bash
-
 LABEL helm="${HELM_VERSION}"
 LABEL helmfile="${HELMFILE_VERSION}"
 LABEL helmdiff="${HELM_DIFF_VERSION}"

From a7363cf7f266dc09530f62f49cb4e363aab5b3bc Mon Sep 17 00:00:00 2001
From: Hristo Dragolov <hristo.dragolov@bedegaming.com>
Date: Thu, 19 May 2022 18:16:20 +0300
Subject: [PATCH 33/43] testing without some pkgs

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 00dcd7a..62cf194 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,9 +19,7 @@ RUN apk add --update \
     musl-dev \
     python3-dev \
     python3 \
-    ca-certificates \
-    libffi-dev \
-    gnupg && \
+    libffi-dev && \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps

From 472a7906a53e5a92f60a174cb504777756cec573 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 10:43:06 +0300
Subject: [PATCH 34/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 62cf194..f4e4c95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,9 @@ RUN apk add --update \
     python3-dev \
     python3 \
     libffi-dev && \
+    ca-certificates \
+    libffi-dev \
+    gnupg && \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps

From 153f08ef33c0f3f3ab9142a98f519955c127f74d Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 10:57:58 +0300
Subject: [PATCH 35/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4e4c95..f04184c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,14 +20,10 @@ RUN apk add --update \
     python3-dev \
     python3 \
     libffi-dev && \
-    ca-certificates \
-    libffi-dev \
-    gnupg && \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps
 
-RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work

From e637dac2733a632c4e93faf7479f18452ee132f8 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 11:08:57 +0300
Subject: [PATCH 36/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f04184c..bd8502a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN python3 -m pip install azure-cli
 
 # Install helmfile
 
-ADD https://github.com/roboll/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
+ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
 RUN chmod 0755 /bin/helmfile
 
 LABEL helm="${HELM_VERSION}"

From 9be7d5151ddc7a882d11dc786b502d1ce58b2d77 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 11:35:43 +0300
Subject: [PATCH 37/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bd8502a..a54dd70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,8 +35,7 @@ RUN python3 -m pip install ruamel.yaml
 RUN python3 -m pip install azure-cli
 
 # Install helmfile
-
-ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_linux_amd64 /bin/helmfile
+ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64 /bin/helmfile
 RUN chmod 0755 /bin/helmfile
 
 LABEL helm="${HELM_VERSION}"

From d7ece0056705f98d47ce4ec4d293308746525745 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 11:48:53 +0300
Subject: [PATCH 38/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a54dd70..2ab1e76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ RUN python3 -m pip install ruamel.yaml
 RUN python3 -m pip install azure-cli
 
 # Install helmfile
-ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64 /bin/helmfile
+ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /bin/helmfile
 RUN chmod 0755 /bin/helmfile
 
 LABEL helm="${HELM_VERSION}"

From aff05a42fe616b353c59c2d11d1edd0122464b54 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 12:27:40 +0300
Subject: [PATCH 39/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2ab1e76..e328269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN apk add --update \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps
-
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work

From 663c582b64fcd578b0ed8ef4f325a2db32380606 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 12:39:15 +0300
Subject: [PATCH 40/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e328269..1b10e49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,11 +23,11 @@ RUN apk add --update \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps
-RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From 5f1d4e4ffe722f7573bc2b0c7b333b534ecc0875 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 14:00:29 +0300
Subject: [PATCH 41/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1b10e49..08b8d10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,11 +23,12 @@ RUN apk add --update \
     rm -rf /var/cache/apk/*
 
 # Install helmfile plugin deps
+RUN helm plugin uninstall diff
+RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 RUN helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION}
 # I have no idea why but that is need otherwise
 # diff and secrets plugin don't work
 RUN rm -rf /root/.helm/helm/plugins/https-github.com-databus23-helm-diff /root/.helm/helm/plugins/https-github.com-futuresimple-helm-secrets
-RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
 
 # Install python library
 RUN python3 -m pip install --upgrade pip

From c4e416f2d1ff5a4395e9a5dc19d0d371d735c118 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 16:45:51 +0300
Subject: [PATCH 42/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 08b8d10..dae8318 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,12 @@ RUN python3 -m pip install ruamel.yaml
 RUN python3 -m pip install azure-cli
 
 # Install helmfile
-ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /bin/helmfile
+ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /tmp/helmfile.tar.gz
+RUN tar xzf /tmp/helmfile.tar.gz -C /tmp && \
+    mv /tmp/linux-amd64/helmfile /bin/helmfile && \
+    rm -rf /tmp/helmfile.tar.gz /tmp/linux-amd64
+
+# Set permissions for helmfile binary
 RUN chmod 0755 /bin/helmfile
 
 LABEL helm="${HELM_VERSION}"

From 0df97077321900922a12adc5276a4d9ecc31c6d9 Mon Sep 17 00:00:00 2001
From: Atanas Delchev <atanas.delchev@bedegaming.com>
Date: Mon, 22 May 2023 17:01:04 +0300
Subject: [PATCH 43/43] [Minor][FAB-6680] es mgmt helmfile version update

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dae8318..3b20fe1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,8 +38,8 @@ RUN python3 -m pip install azure-cli
 # Install helmfile
 ADD https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz /tmp/helmfile.tar.gz
 RUN tar xzf /tmp/helmfile.tar.gz -C /tmp && \
-    mv /tmp/linux-amd64/helmfile /bin/helmfile && \
-    rm -rf /tmp/helmfile.tar.gz /tmp/linux-amd64
+    mv /tmp/helmfile /bin/helmfile && \
+    rm -rf /tmp/helmfile.tar.gz
 
 # Set permissions for helmfile binary
 RUN chmod 0755 /bin/helmfile