From a536946ba927b6f99914638496bfbd82f68a85dc Mon Sep 17 00:00:00 2001 From: Yann Soubeyrand Date: Tue, 22 Jun 2021 15:35:17 +0200 Subject: [PATCH] chore: rebase on Argo CD Docker image v2.0.3 Fixes #8 Closes #9 --- Dockerfile | 2 +- README.md | 2 +- argocd-repo-server-wrapper | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe97b1d..bf92d90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ RUN git clone --branch=20200403-1 --depth=1 https://github.com/camptocamp/helm-s cd helm-sops && \ go build -FROM argoproj/argocd:v1.8.5 +FROM argoproj/argocd:v2.0.3 USER root COPY argocd-repo-server-wrapper /usr/local/bin/ COPY --from=builder /go/helm-sops/helm-sops /usr/local/bin/ diff --git a/README.md b/README.md index 9d8fadb..305f4dc 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: "v1.8.5_c2c.1" + tag: "v2.0.3_c2c.1" ``` #### Using Sops with a GPG key diff --git a/argocd-repo-server-wrapper b/argocd-repo-server-wrapper index 48dc7cd..bcbb70f 100755 --- a/argocd-repo-server-wrapper +++ b/argocd-repo-server-wrapper @@ -7,4 +7,4 @@ then gpg --import "${GPG_PRIVATE_KEY_FILE}" fi -exec "$(dirname "$0")/_$(basename "$0")" "$@" +ARGOCD_BINARY_NAME="$(basename "$0")" exec "$(dirname "$0")/_$(basename "$0")" "$@"