Skip to content

Commit

Permalink
Merge pull request #94 from sony/feature/20180905-get-cmake-from-yum-…
Browse files Browse the repository at this point in the history
…repository

Get cmake 3.x from EPEL repository.
  • Loading branch information
YukioOobuchi authored Sep 13, 2018
2 parents 1bdc683 + 8e4fd58 commit d8fc000
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions docker/development/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ RUN yum install -y \
epel-release \
yum-utils \
&& yum install -y \
cmake3 \
curl \
hdf5 \
hdf5-devel \
unzip \
wget \
zip \
zlib-static \
&& yum clean all
&& yum clean all \
&& ln -s /usr/bin/cmake3 /usr/local/bin/cmake

# ----------------------------------------------------------------------------
# TODO: More sustainable way of installing gcc 5.x.
Expand Down Expand Up @@ -70,24 +72,6 @@ ENV PATH=/opt/rh/git19/root/usr/bin:/opt/rh/devtoolset-4/root/usr/bin:$PATH
ENV LD_LIBRARY_PATH=/opt/rh/gti19/root/usr/lib64:/opt/rh/devtoolset-4/root/usr/lib64:/opt/rh/devtoolset-4/root/usr/lib:$LD_LIBRARY_PATH
ENV PKG_CONFIG_PATH=/opt/rh/git19/root/usr/lib64/pkgconfig:$PKG_CONFIG_PATH

################################################## cmake
RUN mkdir /tmp/deps \
&& cd /tmp/deps \
&& yum install -y cmake \
&& curl -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz -o cmake-3.9.0.tar.gz \
&& tar xf cmake-3.9.0.tar.gz \
&& cd cmake-3.9.0 \
&& mkdir build \
&& cd build \
&& cmake -DBUILD_TESTING=FALSE .. \
&& make \
&& make install \
&& yum remove -y cmake libarchive \
&& yum clean all \
&& rm -rf /var/cache/yum/* \
&& cd / \
&& rm -rf /tmp/*

################################################## protobuf
RUN mkdir /tmp/deps \
&& cd /tmp/deps \
Expand Down

0 comments on commit d8fc000

Please sign in to comment.