You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/02/26 03:35:47 UTC
mesos git commit: Fixed some small issue in the Mesos mini script.
Repository: mesos
Updated Branches:
refs/heads/master a566d0e29 -> 88379b8ea
Fixed some small issue in the Mesos mini script.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/88379b8e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/88379b8e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/88379b8e
Branch: refs/heads/master
Commit: 88379b8eac349793e422f30816d8c81bc0de0497
Parents: a566d0e
Author: Jie Yu <yu...@gmail.com>
Authored: Sun Feb 25 19:35:23 2018 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Sun Feb 25 19:35:23 2018 -0800
----------------------------------------------------------------------
support/mesos-mini/Dockerfile | 3 +--
support/mesos-mini/docker_env.sh | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/88379b8e/support/mesos-mini/Dockerfile
----------------------------------------------------------------------
diff --git a/support/mesos-mini/Dockerfile b/support/mesos-mini/Dockerfile
index 29761a2..0693310 100644
--- a/support/mesos-mini/Dockerfile
+++ b/support/mesos-mini/Dockerfile
@@ -1,5 +1,4 @@
-#FROM mesos/mesos-centos
-FROM jieyu/mesos
+FROM mesos/mesos-centos
RUN yum install -y java-1.8.0-openjdk iptables
http://git-wip-us.apache.org/repos/asf/mesos/blob/88379b8e/support/mesos-mini/docker_env.sh
----------------------------------------------------------------------
diff --git a/support/mesos-mini/docker_env.sh b/support/mesos-mini/docker_env.sh
index b82683c..ee7db85 100755
--- a/support/mesos-mini/docker_env.sh
+++ b/support/mesos-mini/docker_env.sh
@@ -2,8 +2,8 @@
set -o errexit -o nounset -o pipefail -o verbose
-CGROUP_PARENT=`grep memory /proc/1/cgroup | cut -d: -f3`
+CGROUP=`grep memory /proc/1/cgroup | cut -d: -f3`
cat <<EOF > "/etc/docker/env"
-CGROUP_PARENT=${CGROUP_PARENT}
+CGROUP_PARENT=${CGROUP}/docker
EOF