From 2c832467d1aeb6d4a8b65573a7fb6e2783b79a94 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Thu, 4 Apr 2019 15:06:09 +0200 Subject: [PATCH] Ensure Git >=2.12 in both images and CI --- .circleci/config.yml | 7 +++++++ docker/Dockerfile.flux | 2 +- docker/Dockerfile.helm-operator | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b675a0d8e..d47399a96 100644 --- 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 index 6c4d5bb4e..4bf186daa 100644 --- 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 index fca75fc0a..acf6165a1 100644 --- 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