Merge branch 'camptocamp:master' into master

snapp-incubator · May 25, 2023 · 2650958 · 2650958
2 parents c9b5f64 + f27642a
commit 2650958
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,11 @@
-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=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
 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.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
@@ -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.7_c2c.1"
 ```
 
 #### Using Sops with a GPG key