Ensure Git >=2.12 in both images and CI

fluxcd · May 9, 2019 · 3966466 · 3966466
1 parent d17767f
commit 3966466
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,6 +9,13 @@ jobs:
       - checkout
       - setup_remote_docker
 
+      - run:
+          # Ensure latest version of git
+          command: |
+            echo "deb http://deb.debian.org/debian stretch-backports main" | sudo tee -a /etc/apt/sources.list.d/stretch-backports.list
+            sudo apt-get update
+            sudo apt-get install -t stretch-backports -y --only-upgrade git
+            git version
       - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
       - run: dep ensure -vendor-only
       - run: make check-generated

diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 WORKDIR /home/flux
 
-RUN apk add --no-cache openssh ca-certificates tini 'git>=2.3.0' gnupg
+RUN apk add --no-cache openssh ca-certificates tini 'git>=2.12.0' gnupg
 
 # Add git hosts to known hosts file so we can use
 # StrickHostKeyChecking with git+ssh

diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 WORKDIR /home/flux
 
-RUN apk add --no-cache openssh ca-certificates tini 'git>=2.3.0'
+RUN apk add --no-cache openssh ca-certificates tini 'git>=2.12.0'
 
 # Add git hosts to known hosts file so we can use
 # StrickHostKeyChecking with git+ssh