You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/09/06 17:16:07 UTC
mesos git commit: Updated CMake version in docker build helper.
Repository: mesos
Updated Branches:
refs/heads/master 7b5b728da -> 32c3bb19a
Updated CMake version in docker build helper.
Since the minimum version of CMake was bumped to 3.7,
this updates the docker build helper to download CMake 3.8
(stable release that has been out for some time). The reason
we do not use a package repository for CMake is that none
of them offer a version of CMake beyond 3.5.
Review: https://reviews.apache.org/r/62094
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/32c3bb19
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/32c3bb19
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/32c3bb19
Branch: refs/heads/master
Commit: 32c3bb19a2c632c277336c18d658b28345a99110
Parents: 7b5b728
Author: Joseph Wu <jo...@apache.org>
Authored: Tue Sep 5 11:09:33 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Wed Sep 6 10:15:45 2017 -0700
----------------------------------------------------------------------
support/docker-build.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/32c3bb19/support/docker-build.sh
----------------------------------------------------------------------
diff --git a/support/docker-build.sh b/support/docker-build.sh
index d17cc76..6443e56 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -42,7 +42,7 @@ case $OS in
append_dockerfile "RUN yum install -y which"
append_dockerfile "RUN yum groupinstall -y 'Development Tools'"
append_dockerfile "RUN yum install -y epel-release" # Needed for clang.
- append_dockerfile "RUN yum install -y clang git maven cmake"
+ append_dockerfile "RUN yum install -y clang git maven"
append_dockerfile "RUN yum install -y java-1.8.0-openjdk-devel python-devel python-six zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-utils-devel libevent-devel libev-devel"
# Add an unprivileged user.
@@ -62,7 +62,7 @@ case $OS in
# IBM Power only supports Ubuntu 14.04 and gcc compiler.
[ "$(uname -m)" = "x86_64" ] && CLANG_PKG=clang-3.5 || CLANG_PKG=
append_dockerfile "RUN apt-get update"
- append_dockerfile "RUN apt-get -y install build-essential $CLANG_PKG git maven autoconf libtool cmake"
+ append_dockerfile "RUN apt-get -y install build-essential $CLANG_PKG git maven autoconf libtool"
append_dockerfile "RUN apt-get -y install openjdk-7-jdk python-dev python-six libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev"
append_dockerfile "RUN apt-get -y install wget curl sed"
@@ -75,6 +75,10 @@ case $OS in
;;
esac
+# Install a more recent version of CMake than can be installed via packages.
+append_dockerfile "RUN curl -sSL https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.sh -o /tmp/install-cmake.sh"
+append_dockerfile "RUN chmod u+x /tmp/install-cmake.sh && /tmp/install-cmake.sh --skip-license --prefix=/usr/local"
+
case $COMPILER in
gcc)
append_dockerfile "ENV CC gcc"