From 472a7906a53e5a92f60a174cb504777756cec573 Mon Sep 17 00:00:00 2001 From: Atanas Delchev Date: Mon, 22 May 2023 10:43:06 +0300 Subject: [PATCH 01/10] [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 Date: Mon, 22 May 2023 10:57:58 +0300 Subject: [PATCH 02/10] [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 Date: Mon, 22 May 2023 11:08:57 +0300 Subject: [PATCH 03/10] [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 Date: Mon, 22 May 2023 11:35:43 +0300 Subject: [PATCH 04/10] [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 Date: Mon, 22 May 2023 11:48:53 +0300 Subject: [PATCH 05/10] [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 Date: Mon, 22 May 2023 12:27:40 +0300 Subject: [PATCH 06/10] [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 Date: Mon, 22 May 2023 12:39:15 +0300 Subject: [PATCH 07/10] [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 Date: Mon, 22 May 2023 14:00:29 +0300 Subject: [PATCH 08/10] [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 Date: Mon, 22 May 2023 16:45:51 +0300 Subject: [PATCH 09/10] [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 Date: Mon, 22 May 2023 17:01:04 +0300 Subject: [PATCH 10/10] [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