From 4415397c487c1a9ad7c20ffde7308780e9995798 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Thu, 8 Feb 2018 14:08:31 -0800 Subject: [PATCH 1/2] Clarify network plugins and swarm mode Signed-off-by: Misty Stanley-Jones Upstream-commit: 16d29b3cd67dcb34f4fa9c5357866ac99301ce40 Component: cli --- components/cli/docs/extend/plugins_network.md | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/components/cli/docs/extend/plugins_network.md b/components/cli/docs/extend/plugins_network.md index dcebca6095..66302c5cf2 100644 --- a/components/cli/docs/extend/plugins_network.md +++ b/components/cli/docs/extend/plugins_network.md @@ -26,18 +26,13 @@ LibNetwork, which shares plugin infrastructure with Engine. Effectively, network driver plugins are activated in the same way as other plugins, and use the same kind of protocol. -## Network driver plugins and swarm mode +## Network plugins and swarm mode -Docker 1.12 adds support for cluster management and orchestration called -[swarm mode](https://docs.docker.com/engine/swarm/). Docker Engine running in swarm mode currently -only supports the built-in overlay driver for networking. Therefore existing -networking plugins will not work in swarm mode. +[Legacy plugins](legacy_plugins.md) do not work in swarm mode. However, +plugins written using the [v2 plugin system](index.md) do work in swarm mode, as +long as they are installed on each swarm worker node. -When you run Docker Engine outside of swarm mode, all networking plugins that -worked in Docker 1.11 will continue to function normally. They do not require -any modification. - -## Using network driver plugins +## Use network driver plugins The means of installing and running a network driver plugin depend on the particular plugin. So, be sure to install your plugin according to the @@ -57,6 +52,13 @@ referring to that network will be sent to the plugin, $ docker run --network=mynet busybox top +## Find network plugins + +Network plugins are written by third parties, and are published by those +third parties, either on +[Docker Store](https://store.docker.com/search?category=network&q=&type=plugin) +or on the third party's site. + ## Write a network plugin Network plugins implement the [Docker plugin @@ -68,7 +70,7 @@ The network driver protocol, in addition to the plugin activation call, is documented as part of libnetwork: [https://github.com/docker/libnetwork/blob/master/docs/remote.md](https://github.com/docker/libnetwork/blob/master/docs/remote.md). -# Related Information +## Related Information To interact with the Docker maintainers and other interested users, see the IRC channel `#docker-network`. From 7f25d423884751a3b08b9bb28fb3c4dc7cb48524 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 13 Feb 2018 11:04:54 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Clean=20some=20maintainers=20=F0=9F=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit aluzzardi, anusha, crosbymichael, ehazlett, johnstep, mavenugo, mlaventure 🤗 Signed-off-by: Vincent Demeester Upstream-commit: 2a56ebddcb49732017eb73b5f35c47b7d5de8ac0 Component: cli --- components/cli/MAINTAINERS | 52 ++++---------------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/components/cli/MAINTAINERS b/components/cli/MAINTAINERS index 5360937f84..6235cd830e 100644 --- a/components/cli/MAINTAINERS +++ b/components/cli/MAINTAINERS @@ -1,6 +1,6 @@ # Docker maintainers file # -# This file describes who runs the docker/docker project and how. +# This file describes who runs the docker/cli project and how. # This is a living document - if you see something out of date or missing, speak up! # # It is structured to be consumable by both humans and programs. @@ -21,23 +21,12 @@ # a subsystem, they are responsible for doing so and holding the # subsystem maintainers accountable. If ownership is unclear, they are the de facto owners. - # For each release (including minor releases), a "release captain" is assigned from the - # pool of core maintainers. Rotation is encouraged across all maintainers, to ensure - # the release process is clear and up-to-date. - people = [ "aaronlehmann", "albers", - "aluzzardi", - "anusha", "cpuguy83", - "crosbymichael", "dnephin", - "ehazlett", - "johnstep", "justincormack", - "mavenugo", - "mlaventure", "stevvooe", "tibor", "tonistiigi", @@ -67,7 +56,6 @@ # - close an issue or pull request when it's inappropriate or off-topic people = [ - "ehazlett", "programmerq", "thajeztah" ] @@ -90,41 +78,16 @@ Email = "github@albersweb.de" GitHub = "albers" - [people.aluzzardi] - Name = "Andrea Luzzardi" - Email = "al@docker.com" - GitHub = "aluzzardi" - - [people.anusha] - Name = "Anusha Ragunathan" - Email = "anusha@docker.com" - GitHub = "anusha-ragunathan" - [people.cpuguy83] Name = "Brian Goff" Email = "cpuguy83@gmail.com" GitHub = "cpuguy83" - [people.crosbymichael] - Name = "Michael Crosby" - Email = "crosbymichael@gmail.com" - GitHub = "crosbymichael" - [people.dnephin] Name = "Daniel Nephin" Email = "dnephin@gmail.com" GitHub = "dnephin" - [people.ehazlett] - Name = "Evan Hazlett" - Email = "ejhazlett@gmail.com" - GitHub = "ehazlett" - - [people.johnstep] - Name = "John Stephens" - Email = "johnstep@docker.com" - GitHub = "johnstep" - [people.justincormack] Name = "Justin Cormack" Email = "justin.cormack@docker.com" @@ -135,15 +98,10 @@ Email = "misty@docker.com" GitHub = "mistyhacks" - [people.mlaventure] - Name = "Kenfe-Mickaël Laventure" - Email = "mickael.laventure@docker.com" - GitHub = "mlaventure" - - [people.shykes] - Name = "Solomon Hykes" - Email = "solomon@docker.com" - GitHub = "shykes" + [people.programmerq] + Name = "Jeff Anderson" + Email = "jeff@docker.com" + GitHub = "programmerq" [people.stevvooe] Name = "Stephen Day"