Merge pull request #3115 from dholbach/update-alpine

Update alpine and git version
fluxcd · Jun 5, 2020 · 8c36b92 · 8c36b92
2 parents f42a15e + 9f06ba2
commit 8c36b92
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
@@ -1,8 +1,8 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 WORKDIR /home/flux
 
-RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0' 'gnutls>=3.6.7' 'glib>=2.62.5-r0' gnupg gawk socat
+RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.24.2' 'gnutls>=3.6.7' 'glib>=2.62.5-r0' gnupg gawk socat
 RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing git-secret
 
 # Add git hosts to known hosts file so we can use