diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile index 8ca989290ed49edabd8383f7785c2037b67d9ac0..1d4a05a22543fca125facc7d561cadb8cf4da2c6 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 cde5a41505bdebaa871a5c5c5f3979663395cd5b..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..618f27370ede8e04d1c917fb1f0f0c337e6711a8 --- /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