You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2017/10/11 12:36:30 UTC
[1/2] mesos git commit: Removed unneeded configure step in mesos-tidy
Docker image.
Repository: mesos
Updated Branches:
refs/heads/master de7beab4f -> 090830314
Removed unneeded configure step in mesos-tidy Docker image.
The mesos-tidy Docker image uses the cmake build to prepare Mesos for
linting. The cmake build does not require running of 'bootstrap'.
Review: https://reviews.apache.org/r/62418/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/883cc9d0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/883cc9d0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/883cc9d0
Branch: refs/heads/master
Commit: 883cc9d005a3abd4897cc1682afa83b0b4a4ae2d
Parents: de7beab
Author: Benjamin Bannier <bb...@apache.org>
Authored: Wed Oct 11 12:05:58 2017 +0200
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Wed Oct 11 12:05:58 2017 +0200
----------------------------------------------------------------------
support/mesos-tidy/entrypoint.sh | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/883cc9d0/support/mesos-tidy/entrypoint.sh
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index 68026f4..adb554f 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -23,7 +23,6 @@ SRCDIR=/tmp/SRC
# Prepare sources
git clone --depth 1 file:///SRC "${SRCDIR}"
-(cd "${SRCDIR}" && ./bootstrap)
# Configure sources
cmake -DCMAKE_BUILD_TYPE=Release \
[2/2] mesos git commit: Installed newer cmake version in mesos-tidy
Docker image.
Posted by bb...@apache.org.
Installed newer cmake version in mesos-tidy Docker image.
As of '85bc58196fc2bcb94e8e3193dacf5cc8a2af4301' the Mesos cmake setup
requires at least cmake-3.7.0. This patch install cmake-3.8.2 in the
mesos-tidy Docker image so we can build Mesos in that image as well.
Review: https://reviews.apache.org/r/62417/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/09083031
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/09083031
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/09083031
Branch: refs/heads/master
Commit: 0908303142f641c1697547eb7f8e82a205d6c362
Parents: 883cc9d
Author: Benjamin Bannier <bb...@apache.org>
Authored: Wed Oct 11 12:06:07 2017 +0200
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Wed Oct 11 12:06:07 2017 +0200
----------------------------------------------------------------------
support/mesos-tidy/Dockerfile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/09083031/support/mesos-tidy/Dockerfile
----------------------------------------------------------------------
diff --git a/support/mesos-tidy/Dockerfile b/support/mesos-tidy/Dockerfile
index 1cf582e..61455eb 100644
--- a/support/mesos-tidy/Dockerfile
+++ b/support/mesos-tidy/Dockerfile
@@ -24,11 +24,19 @@ RUN apt-get update
RUN apt-get install -qy --no-install-recommends \
build-essential \
ca-certificates \
- cmake \
+ curl \
git \
python-dev && \
apt-get clean
+# Mesos requires at least cmake-3.7.0 on Linux and cmake-3.8.0 on Windows.
+#
+# TODO(abudnik): Skip this step when a newer version of CMake package is
+# available in OS repository.
+RUN curl -sSL https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.sh \
+ -o /tmp/install-cmake.sh && \
+ sh /tmp/install-cmake.sh --skip-license --prefix=/usr/local
+
RUN \
git clone --depth 1 -b release_39 http://llvm.org/git/llvm /tmp/llvm && \
git clone --depth 1 -b mesos_39 http://github.com/mesos/clang.git /tmp/llvm/tools/clang && \