From e9198124b65a7ed0ac0109282f4fce3430ec9637 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 23 Jan 2020 03:11:34 +0100
Subject: [PATCH] centos-7: Use newer git (2.18), include it in toolchain at
front
---
centos-7/Dockerfile | 4 ++--
centos-7/bash/gcc-8.sh | 1 -
centos-7/bash/toolchain.sh | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
delete mode 100644 centos-7/bash/gcc-8.sh
create mode 100644 centos-7/bash/toolchain.sh
diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile
index 8ca9892..1d4a05a 100644
--- a/centos-7/Dockerfile
+++ b/centos-7/Dockerfile
@@ -9,8 +9,9 @@ ENV BASH_ENV "/etc/profile"
RUN yum install -y centos-release-scl && \
yum install -y epel-release && \
yum install -y devtoolset-8 && \
+ yum install -y rh-git218-git && \
yum clean all
-ADD bash/gcc-8.sh /etc/profile.d/gcc-8.sh
+ADD bash/toolchain.sh /etc/profile.d/toolchain.sh
ADD bash/ld-library-path.sh /etc/profile.d/ld-library-path.sh
# CMake
@@ -336,7 +337,6 @@ RUN yum install -y \
# Additional development dependencies
RUN yum install -y \
- git \
libepoxy-devel \
&& \
yum clean all && \
diff --git a/centos-7/bash/gcc-8.sh b/centos-7/bash/gcc-8.sh
deleted file mode 100644
index cde5a41..0000000
--- a/centos-7/bash/gcc-8.sh
+++ /dev/null
@@ -1 +0,0 @@
-source scl_source enable devtoolset-8
diff --git a/centos-7/bash/toolchain.sh b/centos-7/bash/toolchain.sh
new file mode 100644
index 0000000..618f273
--- /dev/null
+++ b/centos-7/bash/toolchain.sh
@@ -0,0 +1,5 @@
+# GCC 8
+source scl_source enable devtoolset-8
+
+# Git 2.18
+source scl_source enable rh-git218
\ No newline at end of file
--
GitLab