From 76933ed88938911e1ee92dbe016fcd8d64e95f33 Mon Sep 17 00:00:00 2001
From: Jorge Machado <jorge.machado@dxc.com>
Date: Mon, 22 Jul 2019 21:14:39 +0200
Subject: [PATCH] * upgrade from git on containers * agreed with terms of DCO
 1.1

Signed-off-by: Jorge Machado <jorge@jmachado.me>
---
 awx/ui/test/e2e/cluster/Dockerfile                  | 5 +++--
 installer/roles/image_build/files/Dockerfile.sdist  | 5 +++--
 installer/roles/image_build/templates/Dockerfile.j2 | 5 +++--
 tools/docker-compose/Dockerfile                     | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/awx/ui/test/e2e/cluster/Dockerfile b/awx/ui/test/e2e/cluster/Dockerfile
index 0c92d037fe..64bfa4f7c7 100644
--- a/awx/ui/test/e2e/cluster/Dockerfile
+++ b/awx/ui/test/e2e/cluster/Dockerfile
@@ -1,11 +1,12 @@
 FROM centos:7
 
-RUN yum install -y epel-release
+RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
 
 RUN yum install -y \
     bzip2 \
     gcc-c++ \
-    git \
+    git2u \
+    git2u-core \
     make \
     nodejs \
     npm
diff --git a/installer/roles/image_build/files/Dockerfile.sdist b/installer/roles/image_build/files/Dockerfile.sdist
index 8d4fbf29aa..8b35e7d11b 100644
--- a/installer/roles/image_build/files/Dockerfile.sdist
+++ b/installer/roles/image_build/files/Dockerfile.sdist
@@ -1,11 +1,12 @@
 FROM centos:7
 
-RUN yum install -y epel-release
+RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
 
 RUN yum install -y bzip2 \
     gcc-c++ \
     gettext \
-    git \
+    git2u \
+    git2u-core \
     make \
     nodejs \
     python36-setuptools
diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2
index c281b5010f..68bae23905 100644
--- a/installer/roles/image_build/templates/Dockerfile.j2
+++ b/installer/roles/image_build/templates/Dockerfile.j2
@@ -5,7 +5,7 @@ USER root
 ADD ansible.repo /etc/yum.repos.d/ansible.repo
 ADD RPM-GPG-KEY-ansible-release /etc/pki/rpm-gpg/RPM-GPG-KEY-ansible-release
 
-RUN yum -y update && yum -y install epel-release
+RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
 
 # sync with tools/docker-compose/Dockerfile
 RUN yum -y install acl \
@@ -16,7 +16,8 @@ RUN yum -y install acl \
   cyrus-sasl-devel \
   gcc \
   gcc-c++ \
-  git \
+  git2u \
+  git2u-core \
   krb5-devel \
   krb5-libs \
   krb5-workstation \
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 413be8b7da..46dced8a66 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:7
 
 ARG UID=0
 
-RUN yum -y update && yum -y install epel-release
+RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
 
 # sync with installer/roles/image_build/templates/Dockerfile.j2
 RUN yum -y install acl \
@@ -17,7 +17,8 @@ RUN yum -y install acl \
   gcc \
   gcc-c++ \
   GConf2 \
-  git \
+  git2u \
+  git2u-core \
   gtk3 \
   ipa-gothic-fonts \
   krb5-devel \