From 560e5e7bca41123f808450046e2ffe718ea9d5b9 Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Tue, 11 Aug 2020 11:10:33 -0700 Subject: [PATCH] Add cmake 3.6.2 and clang/llvm7 (#354) * Add cmake 3.6.2 and clang/llvm7 * Add clang * Use entrypoint in place of run * Remove env change Co-authored-by: jashook --- src/centos/7/source-build/Dockerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/centos/7/source-build/Dockerfile b/src/centos/7/source-build/Dockerfile index 9a4361115..6c3f065f6 100644 --- a/src/centos/7/source-build/Dockerfile +++ b/src/centos/7/source-build/Dockerfile @@ -11,7 +11,6 @@ RUN yum install -y \ "perl(Time::HiRes)" \ autoconf \ automake \ - clang \ devtoolset-7-gcc* \ doxygen \ gdb \ @@ -30,7 +29,8 @@ RUN yum install -y \ libunwind-devel \ libuuid-devel \ libxml2-devel \ - llvm \ + llvm-toolset-7.0 \ + llvm-toolset-7.0-cmake \ lttng-ust-devel \ lzma \ make \ @@ -50,12 +50,4 @@ RUN yum install -y \ && \ yum clean all -# Add cmake 3.6.2. This is not including in the package manager, yum install -# cmake will include 2.8 - -RUN wget https://github.com/Kitware/CMake/releases/download/v3.6.2/cmake-3.6.2-Linux-x86_64.tar.gz && \ - tar -xvf cmake-3.6.2-Linux-x86_64.tar.gz && \ - mv cmake-3.6.2-Linux-x86_64 /cmake - -# Add to path -ENV PATH "${PATH}:/cmake/bin" \ No newline at end of file +ENTRYPOINT [ "scl", "enable", "llvm-toolset-7.0", "bash" ] \ No newline at end of file