Skip to content

Commit

Permalink
Add cmake 3.6.2 and clang/llvm7 (#354)
Browse files Browse the repository at this point in the history
* Add cmake 3.6.2 and clang/llvm7

* Add clang

* Use entrypoint in place of run

* Remove env change

Co-authored-by: jashook <jashoo@MININT-9ROSV4Q.europe.corp.microsoft.com>
  • Loading branch information
Jarret Shook and jashook committed Aug 11, 2020
1 parent 0acac6c commit 560e5e7
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions src/centos/7/source-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN yum install -y \
"perl(Time::HiRes)" \
autoconf \
automake \
clang \
devtoolset-7-gcc* \
doxygen \
gdb \
Expand All @@ -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 \
Expand All @@ -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"
ENTRYPOINT [ "scl", "enable", "llvm-toolset-7.0", "bash" ]

0 comments on commit 560e5e7

Please sign in to comment.