You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/08 20:35:43 UTC

mesos git commit: Add PowerPC LE CI for support/docker_build.sh.

Repository: mesos
Updated Branches:
  refs/heads/master 6a8e83d47 -> a7378d874


Add PowerPC LE CI for support/docker_build.sh.

Review: https://reviews.apache.org/r/45803/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a7378d87
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a7378d87
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a7378d87

Branch: refs/heads/master
Commit: a7378d874f501e4cc40c486cb8a4a3a4b92c6c4f
Parents: 6a8e83d
Author: Zhiwei Chen <zh...@gmail.com>
Authored: Fri Apr 8 11:34:08 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Apr 8 11:35:31 2016 -0700

----------------------------------------------------------------------
 support/docker_build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a7378d87/support/docker_build.sh
----------------------------------------------------------------------
diff --git a/support/docker_build.sh b/support/docker_build.sh
index e9b1d72..c5917bc 100755
--- a/support/docker_build.sh
+++ b/support/docker_build.sh
@@ -47,7 +47,7 @@ case $OS in
     # Add an unprivileged user.
     append_dockerfile "RUN adduser mesos"
    ;;
-  ubuntu*)
+  *ubuntu*)
     # NOTE: Currently we only support Ubuntu13.10+ due to the
     # compiler versions needed to compile Mesos.
 
@@ -58,8 +58,10 @@ case $OS in
     append_dockerfile "RUN rm -rf /var/lib/apt/lists/*"
 
     # Install dependencies.
+    # IBM Power only supports Ubuntu 14.04 and gcc compiler.
+    [ "$(uname -m)" = "x86_64" ] && CLANG_PKG=clang || CLANG_PKG=
     append_dockerfile "RUN apt-get update"
-    append_dockerfile "RUN apt-get -y install build-essential clang git maven autoconf libtool"
+    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-boto libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev"
 
     # Add an unpriviliged user.