From 6f9eac7c8e6207178fa0532ac7dcc09fe213446c Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Wed, 2 May 2018 23:21:45 -0400 Subject: [PATCH 1/2] a bit more detail on network drivers included --- slides/intro/Container_Network_Model.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/slides/intro/Container_Network_Model.md b/slides/intro/Container_Network_Model.md index 851c8d33..8f069f0e 100644 --- a/slides/intro/Container_Network_Model.md +++ b/slides/intro/Container_Network_Model.md @@ -65,9 +65,17 @@ eb0eeab782f4 host host * A network is managed by a *driver*. -* All the drivers that we have seen before are available. +* The built-in drivers include: -* A new multi-host driver, *overlay*, is available out of the box. + * `bridge` (default) + + * `none` + + * `host` + + * `macvlan` + +* A multi-host driver, *overlay*, is available out of the box (Swarm clusters). * More drivers can be provided by plugins (OVS, VLAN...) From cb828ecbd3af19f9d43377e8f1893b9df4ab1141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sat, 5 May 2018 05:41:01 -0500 Subject: [PATCH 2/2] Update Container_Network_Model.md --- slides/intro/Container_Network_Model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/intro/Container_Network_Model.md b/slides/intro/Container_Network_Model.md index 8f069f0e..20cc7e33 100644 --- a/slides/intro/Container_Network_Model.md +++ b/slides/intro/Container_Network_Model.md @@ -75,7 +75,7 @@ eb0eeab782f4 host host * `macvlan` -* A multi-host driver, *overlay*, is available out of the box (Swarm clusters). +* A multi-host driver, *overlay*, is available out of the box (for Swarm clusters). * More drivers can be provided by plugins (OVS, VLAN...)