You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by kl...@apache.org on 2017/05/29 20:22:57 UTC
mesos git commit: Added 'python-six' to the list of build
dependencies.
Repository: mesos
Updated Branches:
refs/heads/master bf9715a9b -> 8ea469909
Added 'python-six' to the list of build dependencies.
Review: https://reviews.apache.org/r/59632
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8ea46990
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8ea46990
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8ea46990
Branch: refs/heads/master
Commit: 8ea46990999b61d7d79a23b582b5eb7d586bd164
Parents: bf9715a
Author: Kevin Klues <kl...@gmail.com>
Authored: Mon May 29 12:04:23 2017 -0700
Committer: Kevin Klues <kl...@gmail.com>
Committed: Mon May 29 12:06:18 2017 -0700
----------------------------------------------------------------------
docs/getting-started.md | 8 ++++----
support/docker-build.sh | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8ea46990/docs/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 85a959c..668865d 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -47,7 +47,7 @@ Following are the instructions for stock Ubuntu 14.04. If you are using a differ
$ sudo apt-get install -y autoconf libtool
# Install other Mesos dependencies.
- $ sudo apt-get -y install build-essential python-dev python-virtualenv libcurl4-nss-dev libsasl2-dev libsasl2-modules maven libapr1-dev libsvn-dev
+ $ sudo apt-get -y install build-essential python-dev python-six python-virtualenv libcurl4-nss-dev libsasl2-dev libsasl2-modules maven libapr1-dev libsvn-dev
### Ubuntu 16.04
@@ -66,7 +66,7 @@ Following are the instructions for stock Ubuntu 16.04. If you are using a differ
$ sudo apt-get install -y autoconf libtool
# Install other Mesos dependencies.
- $ sudo apt-get -y install build-essential python-dev python-virtualenv libcurl4-nss-dev libsasl2-dev libsasl2-modules maven libapr1-dev libsvn-dev zlib1g-dev
+ $ sudo apt-get -y install build-essential python-dev python-six python-virtualenv libcurl4-nss-dev libsasl2-dev libsasl2-modules maven libapr1-dev libsvn-dev zlib1g-dev
### Mac OS X 10.11 (El Capitan), macOS 10.12 (Sierra)
@@ -157,7 +157,7 @@ Following are the instructions for stock CentOS 6.6. If you are using a differen
$ sudo yum install -y devtoolset-2-toolchain
# Install other Mesos dependencies.
- $ sudo yum install -y apache-maven python-devel python-virtualenv java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+ $ sudo yum install -y apache-maven python-devel python-six python-virtualenv java-1.7.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
# Enter a shell with 'devtoolset-2' enabled.
$ scl enable devtoolset-2 bash
@@ -208,7 +208,7 @@ Following are the instructions for stock CentOS 7.1. If you are using a differen
$ sudo yum groupinstall -y "Development Tools"
# Install other Mesos dependencies.
- $ sudo yum install -y apache-maven python-devel python-virtualenv java-1.8.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
+ $ sudo yum install -y apache-maven python-devel python-six python-virtualenv java-1.8.0-openjdk-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-util-devel
### Windows
http://git-wip-us.apache.org/repos/asf/mesos/blob/8ea46990/support/docker-build.sh
----------------------------------------------------------------------
diff --git a/support/docker-build.sh b/support/docker-build.sh
index d16766b..d17cc76 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -43,7 +43,7 @@ case $OS in
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 java-1.8.0-openjdk-devel python-devel zlib-devel libcurl-devel openssl-devel cyrus-sasl-devel cyrus-sasl-md5 apr-devel subversion-devel apr-utils-devel libevent-devel libev-devel"
+ 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.
append_dockerfile "RUN adduser mesos"
@@ -63,7 +63,7 @@ case $OS in
[ "$(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 openjdk-7-jdk python-dev libcurl4-nss-dev libsasl2-dev libapr1-dev libsvn-dev libevent-dev libev-dev"
+ 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"
# Add an unpriviliged user.