You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2016/02/24 18:08:46 UTC
mesos git commit: Fixed fetching uris when slave is running inside a
container.
Repository: mesos
Updated Branches:
refs/heads/master 1ff42bd6a -> 5978e8e5d
Fixed fetching uris when slave is running inside a container.
This still requires the slave work dir is a mounted volume, otherwise
the slave has no way to fetch into the task container's sandbox.
Review: https://reviews.apache.org/r/42390/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5978e8e5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5978e8e5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5978e8e5
Branch: refs/heads/master
Commit: 5978e8e5dd7be9a7d9a1b56c528805b6407175e2
Parents: 1ff42bd
Author: Shuai Lin <li...@gmail.com>
Authored: Wed Feb 24 08:43:49 2016 -0800
Committer: Timothy Chen <tn...@apache.org>
Committed: Wed Feb 24 08:43:49 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5978e8e5/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 0303208..0ed271b 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -319,6 +319,10 @@ DockerContainerizerProcess::Container::create(
newCommandInfo.set_shell(true);
+ if (taskInfo->has_command()) {
+ newCommandInfo.mutable_uris()->CopyFrom(taskInfo->command().uris());
+ }
+
containerInfo = newContainerInfo;
commandInfo = newCommandInfo;
environment = executorEnvironment(