Repository: mesos Updated Branches: refs/heads/master d75fba934 -> 8198579fe
Updated the documentation for '--docker_registry' option. Review: https://reviews.apache.org/r/59019/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8198579f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8198579f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8198579f Branch: refs/heads/master Commit: 8198579fea7e433e202bd33f4ea62eb235859365 Parents: d75fba9 Author: Chun-Hung Hsiao <chhs...@mesosphere.io> Authored: Mon Sep 25 13:05:42 2017 -0700 Committer: Gilbert Song <songzihao1...@gmail.com> Committed: Mon Sep 25 13:08:37 2017 -0700 ---------------------------------------------------------------------- docs/configuration.md | 10 ++++++---- src/slave/flags.cpp | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8198579f/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 1605e3d..e1fd9f7 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1508,10 +1508,12 @@ recovers. --docker_registry=VALUE </td> <td> -The default url for pulling Docker images. It could either be a Docker -registry server url (i.e: <code>https://registry.docker.io</code>), or a local -path (i.e: <code>/tmp/docker/images</code>) in which Docker image archives -(result of <code>docker save</code>) are stored. (default: https://registry-1.docker.io) +The default url for Mesos containerizer to pull Docker images. It could +either be a Docker registry server url (i.e: <code>https://registry.docker.io</code>), +or a local path (i.e: <code>/tmp/docker/images</code>) in which Docker +image archives (result of <code>docker save</code>) are stored. Note +that this option won't change the default registry server for Docker +containerizer. (default: https://registry-1.docker.io) </td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/mesos/blob/8198579f/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 490f78e..d424ade 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -166,10 +166,11 @@ mesos::internal::slave::Flags::Flags() add(&Flags::docker_registry, "docker_registry", - "The default url for pulling Docker images. It could either be a Docker\n" - "registry server url (i.e: `https://registry.docker.io`), or a local\n" - "path (i.e: `/tmp/docker/images`) in which Docker image archives\n" - "(result of `docker save`) are stored.", + "The default url for Mesos containerizer to pull Docker images. It\n" + "could either be a Docker registry server url (i.e: `https://registry.docker.io`),\n" // NOLINT(whitespace/line_length) + "or a local path (i.e: `/tmp/docker/images`) in which Docker image\n" + "archives (result of `docker save`) are stored. Note that this option\n" + "won't change the default registry server for Docker containerizer.", "https://registry-1.docker.io";); add(&Flags::docker_store_dir,
