Add docker_mesos_image flag to slave flags. Review: https://reviews.apache.org/r/29332
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5c3654da Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5c3654da Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5c3654da Branch: refs/heads/master Commit: 5c3654daafa5e86fc98d37d79ce74a6f7c52423a Parents: 3790d74 Author: Timothy Chen <[email protected]> Authored: Mon Dec 1 15:53:29 2014 -0800 Committer: Timothy Chen <[email protected]> Committed: Fri May 22 23:13:50 2015 -0700 ---------------------------------------------------------------------- src/slave/flags.cpp | 8 ++++++++ src/slave/flags.hpp | 1 + 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5c3654da/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index c1b22e8..4d20590 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -297,6 +297,14 @@ mesos::internal::slave::Flags::Flags() "Enable docker containerizer to kill orphaned containers", true); + add(&Flags::docker_mesos_image, + "docker_mesos_image", + "The docker image used to launch this mesos slave instance.\n" + "If an image is specified, the docker containerizer assumes the slave\n" + "is running in a docker container. This enables the docker\n" + "containerizer to launch executors in docker containers, so they keep\n" + "running when the slave container exits."); + add(&Flags::default_container_info, "default_container_info", "JSON formatted ContainerInfo that will be included into\n" http://git-wip-us.apache.org/repos/asf/mesos/blob/5c3654da/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index 3302b71..742ebf9 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -80,6 +80,7 @@ public: std::string containerizers; Option<std::string> default_container_image; std::string docker; + Option<std::string> docker_mesos_image; std::string docker_sandbox_directory; Duration docker_remove_delay; Option<ContainerInfo> default_container_info;
