Merge branch 'master' into swarm2017

slides/autopilot/autotest.py

@@ -136,12 +136,14 @@ class Remote(object):
 def focus_slides():
     subprocess.check_call(["i3-msg", "workspace", "3"])
     subprocess.check_call(["i3-msg", "workspace", "1"])
-    time.sleep(1)
 
 def focus_terminal():
     subprocess.check_call(["i3-msg", "workspace", "2"])
     subprocess.check_call(["i3-msg", "workspace", "1"])
-    time.sleep(1)
+
+def focus_browser():
+    subprocess.check_call(["i3-msg", "workspace", "4"])
+    subprocess.check_call(["i3-msg", "workspace", "1"])
 
 
 remote = Remote()
@@ -388,7 +390,8 @@ while state.next_step < len(actions):
             ipaddr = re.findall("^\[(.*)\]", screen, re.MULTILINE)[-1]
             url = data.replace("/node1", "/{}".format(ipaddr))
             # This should probably be adapted to run on different OS
-            subprocess.check_call(["open", url])
+            subprocess.check_call(["xdg-open", url])
+            focus_browser()
         else:
             logging.warning("Unknown method {}: {!r}".format(method, data))
         state.next_step += 1

slides/common/prereqs.md

@@ -66,6 +66,8 @@ Misattributed to Benjamin Franklin
 
 - Join the chat room on @@CHAT@@
 
+<!-- ```open http://container.training/``` -->
+
 ]
 
 ---
@@ -197,6 +199,32 @@ If anything goes wrong — ask for help!
 
 ---
 
+class: self-paced
+
+## Get your own Docker nodes
+
+- If you already have some Docker nodes: great!
+
+- If not: let's get some thanks to Play-With-Docker
+
+.exercise[
+
+- Go to http://www.play-with-docker.com/
+
+- Log in
+
+- Create your first node
+
+<!-- ```open http://www.play-with-docker.com/``` -->
+
+]
+
+You will need a Docker ID to use Play-With-Docker.
+
+(Creating a Docker ID is free.)
+
+---
+
 ## We will (mostly) interact with node1 only
 
 *These remarks apply only when using multiple nodes, of course.*

slides/swarm/firstservice.md

@@ -89,7 +89,7 @@ class: extra-details
 
 - If you use Play-With-Docker, switch to that node's tab, or set `DOCKER_HOST`
 
-- Otherwise, `ssh` into tht node or use `$(eval docker-machine env node...)`
+- Otherwise, `ssh` into that node or use `$(eval docker-machine env node...)`
 
 ]
 

slides/swarm/netshoot.md

@@ -384,6 +384,6 @@ class: extra-details
 
 ## More about overlay networks
 
-.blackbelt[[Deep Dive in Docker Overlay Networks](https://www.youtube.com/watch?v=b3XDl0YsVsg&index=1&list=PLkA60AVN3hh-biQ6SCtBJ-WVTyBmmYho8) by Laurent Bernaille (DC17US)]
+.blackbelt[DC17US: Deep Dive in Docker Overlay Networks ([video](https://www.youtube.com/watch?v=b3XDl0YsVsg&index=1&list=PLkA60AVN3hh-biQ6SCtBJ-WVTyBmmYho8))]
 
-.blackbelt[Deeper Dive in Docker Overlay Networks by Laurent Bernaille (Wednesday 13:30)]
+.blackbelt[DC17EU: Deeper Dive in Docker Overlay Networks ([video](https://dockercon.docker.com/watch/XkRRA7Etsznv7uAk1UKsri))]

slides/swarm/swarmkit.md

@@ -46,7 +46,7 @@ class: extra-details
 - SwarmKit implements the Raft algorithm directly
   <br/>
   (Nomad is similar; thanks [@cbednarski](https://twitter.com/@cbednarski),
-  [@diptanu](https://twitter.com/diptanu) and others for point it out!)
+  [@diptanu](https://twitter.com/diptanu) and others for pointing it out!)
 
 - Analogy courtesy of [@aluzzardi](https://twitter.com/aluzzardi):