Merge branch 'master' into boosterconf2018

prepare-vms/lib/commands.sh

@@ -177,7 +177,9 @@ _cmd_kubetest() {
     # Feel free to make that better ♥
     pssh "
     set -e
+    [ -f /tmp/node ]
     if grep -q node1 /tmp/node; then
+      which kubectl
       for NODE in \$(awk /\ node/\ {print\ \\\$2} /etc/hosts); do
         echo \$NODE ; kubectl get nodes | grep -w \$NODE | grep -w Ready
       done

slides/index.html

@@ -64,7 +64,7 @@
     <table>
         <tr><td class="header" colspan="4">Container Training</td></tr>
 
-        <tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
+        <tr><td class="title" colspan="4">Coming soon near you</td></tr>
 
         <tr>
 	    <!--
@@ -72,7 +72,7 @@
 thing for now (stay tuned...)</td>
              -->
             <td>March 14, 2018: Boosterconf — Kubernetes 101</td>
-            <td>&nbsp;</td>
+            <td><a class="slides" href="http://boosterconf2018.container.training/" /></td>
             <td><a class="attend" href="https://2018.boosterconf.no/talks/1179" />
         </tr>
 
@@ -82,6 +82,17 @@ thing for now (stay tuned...)</td>
             <td><a class="attend" href="https://www.usenix.org/conference/srecon18americas/presentation/kromhout" />
         </tr>
 
+        <tr>
+            <td>April 11-12, 2018: Introduction aux conteneurs (in French)</td>
+            <td>&nbsp;</td>
+            <td><a class="attend" href="http://paris.container.training/intro.html" />
+        </tr>
+
+        <tr>
+            <td>April 13, 2018: Introduction à l'orchestration (in French)</td>
+            <td>&nbsp;</td>
+            <td><a class="attend" href="http://paris.container.training/kube.html" />
+        </tr>
 
         <tr><td class="title" colspan="4">Past workshops</td></tr>
 

slides/intro/Container_Network_Model.md

@@ -434,7 +434,7 @@ When creating a network, extra options can be provided.
 
 * `--internal` disables outbound traffic (the network won't have a default gateway).
 
-* `--gateway` indicates which address to use for the gateway (when utbound traffic is allowed).
+* `--gateway` indicates which address to use for the gateway (when outbound traffic is allowed).
 
 * `--subnet` (in CIDR notation) indicates the subnet to use.
 

slides/intro/intro.md

@@ -1,7 +1,8 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
-  instructor-led workshops and tutorials
+- This was initially written to support in-person, instructor-led workshops and tutorials
+
+- These materials are maintained by [Jérôme Petazzoni](https://twitter.com/jpetazzo) and [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors)
 
 - You can also follow along on your own, at your own pace
 

slides/kube/intro.md

@@ -1,7 +1,9 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
+- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person,
   instructor-led workshops and tutorials
+  
+- Credit is also due to [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) — thank you!
 
 - You can also follow along on your own, at your own pace
 

slides/swarm/intro.md

@@ -1,7 +1,9 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
+- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person,
   instructor-led workshops and tutorials
+  
+- Over time, [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) also helped to improve these materials — thank you!
 
 - You can also follow along on your own, at your own pace