From 7f23a4c9646dd6c597ac3d405cdd7b8e82232671 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 22 Dec 2017 22:24:37 +0100 Subject: [PATCH 1/4] Fix minor typos --- slides/swarm/firstservice.md | 2 +- slides/swarm/netshoot.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/swarm/firstservice.md b/slides/swarm/firstservice.md index fb8d9f79..56bef3d0 100644 --- a/slides/swarm/firstservice.md +++ b/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...)` ] diff --git a/slides/swarm/netshoot.md b/slides/swarm/netshoot.md index ad500493..360cc246 100644 --- a/slides/swarm/netshoot.md +++ b/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))] From af5ea2188b88c6db8489923e6f4565d2fa80c177 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 22 Dec 2017 22:26:08 +0100 Subject: [PATCH 2/4] More typos --- slides/swarm/swarmkit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/swarm/swarmkit.md b/slides/swarm/swarmkit.md index 04f4882c..a10bb31a 100644 --- a/slides/swarm/swarmkit.md +++ b/slides/swarm/swarmkit.md @@ -46,7 +46,7 @@ class: extra-details - SwarmKit implements the Raft algorithm directly
(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): From eaa4dc63bfd9abfd25223a2999109a3d986f541d Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 22 Dec 2017 22:40:23 +0100 Subject: [PATCH 3/4] Instruct to use PWD in self-paced mode --- slides/common/prereqs.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/slides/common/prereqs.md b/slides/common/prereqs.md index 624486ae..28e6770d 100644 --- a/slides/common/prereqs.md +++ b/slides/common/prereqs.md @@ -66,6 +66,8 @@ Misattributed to Benjamin Franklin - Join the chat room on @@CHAT@@ + + ] --- @@ -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 + + + +] + +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.* From 21f345a96a817039816bf084e9036877f0663f46 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 22 Dec 2017 22:42:33 +0100 Subject: [PATCH 4/4] Improve `open` command --- slides/autopilot/autotest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/slides/autopilot/autotest.py b/slides/autopilot/autotest.py index da966235..1da7aea8 100755 --- a/slides/autopilot/autotest.py +++ b/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