Repository: mesos Updated Branches: refs/heads/master cf25ea38f -> 6ce7c197d
Updated the container image doc about Docker networking support. Review: https://reviews.apache.org/r/58118 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6ce7c197 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6ce7c197 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6ce7c197 Branch: refs/heads/master Commit: 6ce7c197d7cb4ae76e480c46663a0e7d209ea2aa Parents: a9a754e Author: Jie Yu <[email protected]> Authored: Fri Mar 31 12:09:45 2017 -0700 Committer: Jie Yu <[email protected]> Committed: Fri Mar 31 12:48:16 2017 -0700 ---------------------------------------------------------------------- docs/container-image.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce7c197/docs/container-image.md ---------------------------------------------------------------------- diff --git a/docs/container-image.md b/docs/container-image.md index b17739d..87a4fe0 100644 --- a/docs/container-image.md +++ b/docs/container-image.md @@ -238,9 +238,14 @@ the framework can limit the of the container by using the [linux/capabilities](linux_capabilities.md) isolator. -Only host network is supported. We will add bridge network support -soon using CNI support in Mesos -([MESOS-4641](https://issues.apache.org/jira/browse/MESOS-4641)). +Currently, we support `host`, `bridge` and user defined networks +([reference](https://docs.docker.com/engine/userguide/networking/)). +`none` is not supported yet. We support the above networking modes in +Mesos Containerizer (mesos-containerizer.md) using the +[CNI](https://github.com/containernetworking/cni) (Container Network +Interface) standard. Please refer to the [network/cni](cni.md) +isolator document for more details about how to configure the network +for the container. ### More agent flags
