From 9ae61684c851a3c28fa3cbeeda7f8f09724a04e0 Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Fri, 17 Feb 2023 10:00:35 +0100 Subject: [PATCH 1/4] chore: rebase on Argo CD Docker image v2.6.2 --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ff01d3..1b2f652 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN git clone --branch=20200403-1 --depth=1 https://github.com/camptocamp/helm-s RUN wget -O /tmp/helmfile https://github.com/roboll/helmfile/releases/download/v0.144.0/helmfile_linux_amd64 && chmod +x /tmp/helmfile RUN wget -O /tmp/yq https://github.com/mikefarah/yq/releases/download/v4.25.1/yq_linux_amd64 && chmod +x /tmp/yq -FROM quay.io/argoproj/argocd:v2.6.1 +FROM quay.io/argoproj/argocd:v2.6.2 USER root COPY argocd-repo-server-wrapper /usr/local/bin/ COPY argocd-helmfile /usr/local/bin/ diff --git a/README.md b/README.md index ac17d5d..c0cccb8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ To use this custom image when deploying Argo CD using the [Helm chart](https://g global: image: repository: "camptocamp/argocd" - tag: "v2.6.1_c2c.1" + tag: "v2.6.2_c2c.1" ``` #### Using Sops with a GPG key From 297937da96d5d8dcf7381297c01417fa1c94ef8e Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Tue, 16 May 2023 10:32:29 +0200 Subject: [PATCH 2/4] chore: rebase on Argo CD Docker image v2.6.7 --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b2f652..8da924f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN git clone --branch=20200403-1 --depth=1 https://github.com/camptocamp/helm-s RUN wget -O /tmp/helmfile https://github.com/roboll/helmfile/releases/download/v0.144.0/helmfile_linux_amd64 && chmod +x /tmp/helmfile RUN wget -O /tmp/yq https://github.com/mikefarah/yq/releases/download/v4.25.1/yq_linux_amd64 && chmod +x /tmp/yq -FROM quay.io/argoproj/argocd:v2.6.2 +FROM quay.io/argoproj/argocd:v2.6.7 USER root COPY argocd-repo-server-wrapper /usr/local/bin/ COPY argocd-helmfile /usr/local/bin/ diff --git a/README.md b/README.md index c0cccb8..b7f76b6 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ To use this custom image when deploying Argo CD using the [Helm chart](https://g global: image: repository: "camptocamp/argocd" - tag: "v2.6.2_c2c.1" + tag: "v2.6.7_c2c.1" ``` #### Using Sops with a GPG key From 9216f3df4e86ff139d75a72a1b3e029a056f3e3d Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Tue, 16 May 2023 10:34:25 +0200 Subject: [PATCH 3/4] chore: upgrade helm-sops --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8da924f..92ad028 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM docker.io/golang:1.19 as builder -RUN git clone --branch=20200403-1 --depth=1 https://github.com/camptocamp/helm-sops && \ +FROM docker.io/golang:1.20 as builder +RUN git clone --branch=20230516-1 --depth=1 https://github.com/camptocamp/helm-sops && \ cd helm-sops && \ go build RUN wget -O /tmp/helmfile https://github.com/roboll/helmfile/releases/download/v0.144.0/helmfile_linux_amd64 && chmod +x /tmp/helmfile From f27642a4e47685eaca641aa722333ec790c58f2b Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Wed, 17 May 2023 10:15:08 +0200 Subject: [PATCH 4/4] chore: upgrade helm-sops --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 92ad028..d681853 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM docker.io/golang:1.20 as builder -RUN git clone --branch=20230516-1 --depth=1 https://github.com/camptocamp/helm-sops && \ +RUN git clone --branch=20230517-1 --depth=1 https://github.com/camptocamp/helm-sops && \ cd helm-sops && \ go build RUN wget -O /tmp/helmfile https://github.com/roboll/helmfile/releases/download/v0.144.0/helmfile_linux_amd64 && chmod +x /tmp/helmfile