Repository: mesos Updated Branches: refs/heads/master 6ecbf02c2 -> f201bb558
Add support for Ubuntu 16.04 in docker build. Review: https://reviews.apache.org/r/63314/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f201bb55 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f201bb55 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f201bb55 Branch: refs/heads/master Commit: f201bb558ed31da2474aec5b8e429799dd28b4c3 Parents: 6ecbf02 Author: Tomasz Janiszewski <jani...@gmail.com> Authored: Mon Oct 30 17:06:46 2017 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Mon Oct 30 17:06:46 2017 -0700 ---------------------------------------------------------------------- support/docker-build.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f201bb55/support/docker-build.sh ---------------------------------------------------------------------- diff --git a/support/docker-build.sh b/support/docker-build.sh index 50e693c..060194a 100755 --- a/support/docker-build.sh +++ b/support/docker-build.sh @@ -62,9 +62,19 @@ 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" - 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" + append_dockerfile "RUN apt-get install -y build-essential $CLANG_PKG git maven autoconf libtool" + append_dockerfile "RUN apt-get install -y python-dev python-six libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev" + append_dockerfile "RUN apt-get install -y wget curl sed" + + case $OS in + *16.04*) + echo "Install Ubuntu 16.04 LTS (Xenial Xerus) specific packages" + append_dockerfile "RUN apt-get install -y openjdk-8-jdk zlib1g-dev" + ;; + *) + append_dockerfile "RUN apt-get install -y openjdk-7-jdk" + ;; + esac # Add an unpriviliged user. append_dockerfile "RUN adduser --disabled-password --gecos '' mesos"
