Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install modern CMake on build docker images #185

Merged
merged 4 commits into from
Sep 18, 2019
Merged

Install modern CMake on build docker images #185

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23a9104
Install CMake 3.15 on CentOS images.
jkoritzinsky Sep 18, 2019
4df0369
Install CMake from Kitware's provided feed to use most recent release…
jkoritzinsky Sep 18, 2019
b2a5d5b
On Alpine 3.9, install CMake from the edge package repository to get …
jkoritzinsky Sep 18, 2019
a07120a
Fix comments.
jkoritzinsky Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/alpine/3.9/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ RUN apk add --no-cache \
build-base \
clang \
clang-dev \
cmake \
coreutils \
curl \
curl-dev \
Expand All @@ -33,6 +32,7 @@ RUN apk add --no-cache \
zlib-dev

RUN apk -X http://dl-cdn.alpinelinux.org/alpine/edge/main add --no-cache \
cmake \
userspace-rcu-dev \
lttng-ust-dev \
numactl-dev
10 changes: 7 additions & 3 deletions src/centos/6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ RUN yum install -y \
yum install -y \
"perl(Time::HiRes)" \
autoconf \
cmake \
cmake3 \
devtoolset-2-toolchain \
doxygen \
expat-devel \
Expand Down Expand Up @@ -45,6 +43,12 @@ RUN yum install -y \
&& \
yum clean all

# Build and install CMake 3.14

RUN wget -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.sh && \
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
bash ./cmake-install.sh --skip-license --exclude-subdir --prefix=/usr/local && \
rm ./cmake-install.sh

# Build and install clang and lldb 3.9.1

RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
Expand All @@ -71,7 +75,7 @@ RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
cd llvmbuild && \
scl enable python27 devtoolset-2 \
' \
cmake3 \
cmake \
-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/g++ \
-DCMAKE_C_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gcc \
-DCMAKE_LINKER=/opt/rh/devtoolset-2/root/usr/bin/ld \
Expand Down
10 changes: 7 additions & 3 deletions src/centos/7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ RUN yum install -y \
&& \
yum install -y \
"perl(Time::HiRes)" \
cmake \
cmake3 \
doxygen \
gcc \
gcc-c++ \
Expand Down Expand Up @@ -46,6 +44,12 @@ RUN yum install -y \
&& \
yum clean all

# Build and install CMake 3.14

RUN wget -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.sh && \
bash ./cmake-install.sh --skip-license --exclude-subdir --prefix=/usr/local && \
rm ./cmake-install.sh

# Build and install clang and lldb 3.9.1

RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
Expand All @@ -70,7 +74,7 @@ RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
\
mkdir llvmbuild && \
cd llvmbuild && \
cmake3 \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_LIBDIR_SUFFIX=64\
-DLLVM_ENABLE_EH=1 \
Expand Down
2 changes: 1 addition & 1 deletion src/centos/7/mlnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN wget http://releases.llvm.org/3.9.1/openmp-3.9.1.src.tar.xz && \
\
mkdir llvmbuild && \
cd llvmbuild && \
cmake3 \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_LIBDIR_SUFFIX=64\
-DLLVM_ENABLE_EH=1 \
Expand Down
4 changes: 3 additions & 1 deletion src/ubuntu/16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ FROM ubuntu:16.04
# this does not include libraries that we need to compile different projects, we'd like
# them in a different layer.
RUN apt-get update && \
apt-get install -y wget && \
apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget && \
echo "deb http://llvm.org/apt/xenial/ llvm-toolchain-xenial main" | tee /etc/apt/sources.list.d/llvm.list && \
echo "deb http://llvm.org/apt/xenial/ llvm-toolchain-xenial-3.9 main" | tee -a /etc/apt/sources.list.d/llvm.list && \
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - && \
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ xenial main' && \
apt-get update && \
apt-get install -y \
cmake \
Expand Down