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 2016/04/19 03:18:45 UTC
mesos git commit: Made imageless task launched by 'mesos-execute' can
join CNI network.
Repository: mesos
Updated Branches:
refs/heads/master a881a5b32 -> 138522a25
Made imageless task launched by 'mesos-execute' can join CNI network.
Review: https://reviews.apache.org/r/46329/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/138522a2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/138522a2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/138522a2
Branch: refs/heads/master
Commit: 138522a25d2adf77c9be448890d75232c90abd0c
Parents: a881a5b
Author: Qian Zhang <zh...@cn.ibm.com>
Authored: Mon Apr 18 18:18:33 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Apr 18 18:18:33 2016 -0700
----------------------------------------------------------------------
src/cli/execute.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/138522a2/src/cli/execute.cpp
----------------------------------------------------------------------
diff --git a/src/cli/execute.cpp b/src/cli/execute.cpp
index f70d9e1..087a731 100644
--- a/src/cli/execute.cpp
+++ b/src/cli/execute.cpp
@@ -514,15 +514,15 @@ private:
// Mesos containerizer supports 'appc' and 'docker' images.
if (containerizer == "mesos") {
- if (dockerImage.isNone() && appcImage.isNone()) {
+ if (dockerImage.isNone() && appcImage.isNone() &&
+ (networks.isNone() || networks->empty())) {
return None();
}
containerInfo.set_type(ContainerInfo::MESOS);
- Image* image = containerInfo.mutable_mesos()->mutable_image();
-
if (dockerImage.isSome()) {
+ Image* image = containerInfo.mutable_mesos()->mutable_image();
image->set_type(Image::DOCKER);
image->mutable_docker()->set_name(dockerImage.get());
} else if (appcImage.isSome()) {
@@ -546,6 +546,7 @@ private:
appc.mutable_labels()->CopyFrom(labels);
+ Image* image = containerInfo.mutable_mesos()->mutable_image();
image->set_type(Image::APPC);
image->mutable_appc()->CopyFrom(appc);
}