Repository: mesos Updated Branches: refs/heads/master 03bb330b2 -> 24722e44a
Updated docker containerizer private registry doc. Review: https://reviews.apache.org/r/45596/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/24722e44 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/24722e44 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/24722e44 Branch: refs/heads/master Commit: 24722e44a4946b96d76bff16471bea20275bf93a Parents: 03bb330 Author: Gilbert Song <songzihao1...@gmail.com> Authored: Wed Apr 6 11:20:43 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Wed Apr 6 11:21:03 2016 -0700 ---------------------------------------------------------------------- docs/docker-containerizer.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/24722e44/docs/docker-containerizer.md ---------------------------------------------------------------------- diff --git a/docs/docker-containerizer.md b/docs/docker-containerizer.md index 865b2cf..a5d4890 100644 --- a/docs/docker-containerizer.md +++ b/docs/docker-containerizer.md @@ -61,8 +61,34 @@ The containerizer also supports optional force pulling of the image. It is set d ## Private Docker repository -To run an image from a private repository, one can include the uri pointing to a `.dockercfg` that contains login information. The `.dockercfg` file will be pulled into the sandbox the Docker Containerizer -set the HOME environment variable pointing to the sandbox so docker cli will automatically pick up the config file. +To run an image from a private repository, one can include the +uri pointing to a `.dockercfg` that contains login information. +The `.dockercfg` file will be pulled into the sandbox the Docker +Containerizer set the HOME environment variable pointing to the +sandbox so docker cli will automatically pick up the config file. + +Starting from 0.29, we provide an alternative way to specify docker +config file for pulling images from private registries. We allow +operators to specify a shared docker config file using an agent +flag. This docker config file will be used to pull images from +private registries for all containers. See +[configuration documentation](configuration.md) for detail. Operators +can either use a local docker config file (need to manually configure +.docker/config.json or .dockercfg on each slave), or specify the flag +as a JSON-formatted string. For example: + + --docker_config=file:///home/vagrant/.docker/config.json + +or as a JSON object, + + --docker_config="{ \ + \"auths\": { \ + \"https://index.docker.io/v1/\": { \ + \"auth\": \"xXxXxXxXxXx=\", \ + \"email\": \"usern...@example.com\" \ + } \ + } \ + }" ## CommandInfo to run Docker images