[06/20] mesos git commit: Add docker_socket to slave flags.

[tn...@apache.org]

Add docker_socket to slave flags.

Review: https://reviews.apache.org/r/29333


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/168ba44a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/168ba44a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/168ba44a

Branch: refs/heads/master
Commit: 168ba44a41319e71498d47bf9409d0cd3b4eb365
Parents: 5c3654d
Author: Timothy Chen <tn...@apache.org>
Authored: Tue Dec 2 18:21:41 2014 -0800
Committer: Timothy Chen <tn...@apache.org>
Committed: Fri May 22 23:13:50 2015 -0700

----------------------------------------------------------------------
 src/slave/flags.cpp | 7 +++++++
 src/slave/flags.hpp | 1 +
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/168ba44a/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 4d20590..acf30d1 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -305,6 +305,13 @@ mesos::internal::slave::Flags::Flags()
       "containerizer to launch executors in docker containers, so they keep\n"
       "running when the slave container exits.");
 
+  add(&Flags::docker_socket,
+      "docker_socket",
+      "The docker UNIX socket path that the docker CLI uses to communicate\n"
+      "to the docker daemon. Mesos needs this to launch docker containers\n"
+      "that can run the docker CLI.\n",
+      "/var/run/docker.sock");
+
   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/168ba44a/src/slave/flags.hpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index 742ebf9..6ca59dc 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -86,6 +86,7 @@ public:
   Option<ContainerInfo> default_container_info;
   Duration docker_stop_timeout;
   bool docker_kill_orphans;
+  std::string docker_socket;
 #ifdef WITH_NETWORK_ISOLATOR
   uint16_t ephemeral_ports_per_container;
   Option<std::string> eth0_name;