diff --git a/slides/common/logistics.md b/slides/common/logistics.md new file mode 100644 index 00000000..e753eff1 --- /dev/null +++ b/slides/common/logistics.md @@ -0,0 +1,48 @@ +## Intros + + - Hello! We are + AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI) + & + Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.) + + +- This is our collective Docker knowledge: + + ![Bell Curve](images/bell-curve.jpg) + +--- + +## Agenda + +.small[ +- 09:00-09:10 Hello! +- 09:10-10:30 Part 1 +- 10:30-11:00 coffee break +- 11:00-12:30 Part 2 +- 12:30-13:30 lunch break +- 13:30-15:00 Part 3 +- 15:00-15:30 coffee break +- 15:30-17:00 Part 4 +- 17:00-18:00 Afterhours and Q&A +] + + + +- All the content is publicly available (slides, code samples, scripts) + + Upstream URL: https://github.com/jpetazzo/container.training + +- Feel free to interrupt for questions at any time + +- Live feedback, questions, help on @@CHAT@@ diff --git a/slides/common/thankyou.md b/slides/common/thankyou.md new file mode 100644 index 00000000..e5938330 --- /dev/null +++ b/slides/common/thankyou.md @@ -0,0 +1,9 @@ +class: title, self-paced + +Thank you! + +--- + +class: title, in-person + +That's all folks!
Questions? diff --git a/slides/common/title.md b/slides/common/title.md new file mode 100644 index 00000000..2dc50d32 --- /dev/null +++ b/slides/common/title.md @@ -0,0 +1,21 @@ +class: title, self-paced + +@@TITLE@@ + +*Self-paced version* + +--- + +class: title, in-person + +@@TITLE@@ + +**Be kind to the WiFi!** + +*Use the 5G network* +
+*Don't use your hotspot* +
+*Don't stream videos or download big files during the workshop* + +Thank you! diff --git a/slides/common/toc.md b/slides/common/toc.md new file mode 100644 index 00000000..71710718 --- /dev/null +++ b/slides/common/toc.md @@ -0,0 +1,4 @@ + +@@TOC@@ + + diff --git a/slides/dockercon.yml b/slides/dockercon.yml index eefb1d67..bdbe3c87 100644 --- a/slides/dockercon.yml +++ b/slides/dockercon.yml @@ -1,3 +1,5 @@ +title: "Swarm: from Zero to Hero (DC17EU)" + chat: "[Slack](https://dockercommunity.slack.com/messages/C7ET1GY4Q)" exclude: @@ -8,141 +10,13 @@ exclude: - elk-manual - prom-manual -title: "Swarm: from Zero to Hero (DC17EU)" chapters: -- | - class: title - - .small[ - - Swarm: from Zero to Hero - - .small[.small[ - - **Be kind to the WiFi!** - - *Use the 5G network* -
- *Don't use your hotspot* -
- *Don't stream videos from YouTube, Netflix, etc. -
(if you're bored, watch local content instead)* - - Also: share the power outlets -
- *(with limited power comes limited responsibility?)* -
- *(or something?)* - - Thank you! - - ] - ] - ] - - --- - - ## Intros - - - - - Hello! We are Jérôme, Lee, Nicholas, and Scott - - - - -- - - - This is our collective Docker knowledge: - - ![Bell Curve](images/bell-curve.jpg) - - --- - - ## "From zero to hero" - - -- - - - It rhymes, but it's a pretty bad title, to be honest - - -- - - - None of you is a "zero" - - -- - - - None of us is a "hero" - - -- - - - None of us should even try to be a hero - - -- - - *The hero syndrome is a phenomenon affecting people who seek heroism or recognition, - usually by creating a desperate situation which they can resolve. - This can include unlawful acts, such as arson. - The phenomenon has been noted to affect civil servants, - such as firefighters, nurses, police officers, and security guards.* - - (Wikipedia page on [hero syndrome](https://en.wikipedia.org/wiki/Hero_syndrome)) - - --- - - ## Agenda - - .small[ - - 09:00-09:10 Hello! - - 09:10-10:30 Part 1 - - 10:30-11:00 coffee break - - 11:00-12:30 Part 2 - - 12:30-13:30 lunch break - - 13:30-15:00 Part 3 - - 15:00-15:30 coffee break - - 15:30-17:00 Part 4 - - 17:00-18:00 Afterhours and Q&A - ] - - - - - All the content is publicly available (slides, code samples, scripts) - - Upstream URL: https://github.com/jpetazzo/orchestration-workshop - - - Feel free to interrupt for questions at any time - - - Live feedback, questions, help on [Gitter](chat) - - http://container.training/chat - +- common/title.md +- common/logistics.md - swarm/intro.md -- | - @@TOC@@ +- common/toc.md - - swarm/prereqs.md - swarm/versions.md - - | - class: title - - All right! -
- We're all set. -
- Let's do this. - common/sampleapp.md - swarm/swarmkit.md - swarm/creatingswarm.md @@ -165,18 +39,4 @@ chapters: - swarm/stateful.md - swarm/extratips.md - swarm/end.md -- | - class: title - - That's all folks!
Questions? - - .small[.small[ - - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo)) — [@docker](https://twitter.com/docker) - - ]] - - +- common/thankyou.md diff --git a/slides/intro.yml b/slides/intro.yml index 6a3d842e..3805aeb8 100644 --- a/slides/intro.yml +++ b/slides/intro.yml @@ -1,69 +1,14 @@ -title: "LISA17 M7: Getting Started with Docker and Containers" +title: "Introduction to Docker and Containers" -chat: "[Slack](https://usenix-lisa.slack.com/messages/C0E6N1NJW)" +chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" + +exclude: +- self-paced chapters: -- | - class: title - - .small[ - - LISA17 M7 - - Getting Started
with Docker and Containers - - .small[.small[ - - **Be kind to the WiFi!** - - *Use the 5G network* -
- *Don't use your hotspot* -
- *Don't stream videos from YouTube, Netflix, etc. -
(if you're bored, watch local content instead)* - - - - Thank you! - - ] - ] - ] - - --- - - ## Logistics - - - Hello! We are - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.) - & - AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI) - - - The tutorial will run from 1:30pm to 5:00pm - - - This will be fast-paced, but DON'T PANIC! - - - There will be a coffee break at 3:00pm -
- (please remind me if I forget about it!) - - - All the content is publicly available - - One URL to remember: http://container.training - - - Feel free to interrupt for questions at any time - - - Live feedback, questions, help on @@CHAT@@ - -- | - @@TOC@@ +- common/title.md +- common/logistics.md +- common/toc.md - - intro/Docker_Overview.md #- intro/Docker_History.md - intro/Training_Environment.md @@ -89,3 +34,4 @@ chapters: - intro/Working_With_Volumes.md - intro/Compose_For_Dev_Stacks.md - intro/Course_Conclusion.md + - common/thankyou.md diff --git a/slides/kube.yml b/slides/kube.yml index 1c42f651..4e93ab2c 100644 --- a/slides/kube.yml +++ b/slides/kube.yml @@ -1,84 +1,18 @@ +title: | + Deploying and Scaling Microservices + with Docker and Kubernetes + +chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171026-prague)" + exclude: - self-paced - snap -chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171026-prague)" - -title: "Deploying and Scaling Microservices with Docker and Kubernetes" - chapters: -- | - class: title - - .small[ - - Deploying and Scaling Microservices
with Docker and Kubernetes - - .small[.small[ - - **Be kind to the WiFi!** - - - *Don't use your hotspot* -
- *Don't stream videos from YouTube, Netflix, etc. -
(if you're bored, watch local content instead)* - - Thank you! - - ] - ] - ] - - --- - - ## Intros - - - Hello! We are - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.) - & - AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI) - - -- - - - This is our first time doing this - - -- - - - But ... containers and us go back a long way - - -- - - ![CONTAINERS, I TELL YOU](images/aj-containers.jpeg) - - -- - - - In the immortal words of [Chelsea Manning](https://twitter.com/xychelsea): #WeGotThis! - - --- - - ## Logistics - - - The tutorial will run from 9:00am to 12:15pm - - - There will be a coffee break at 10:30am -
- (please remind me if I forget about it!) - - - This will be fast-paced, but DON'T PANIC! -
- (all the content is publicly available) - - - Feel free to interrupt for questions at any time - - - Live feedback, questions, help on @@CHAT@@ - +- common/title.md +- common/logistics.md - kube/intro-ks.md -- | - @@TOC@@ +- common/toc.md - - kube/prereqs-k8s.md - kube/versions-k8s.md - common/sampleapp.md @@ -94,13 +28,4 @@ chapters: - kube/daemonset.md - kube/rollout.md - kube/whatsnext.md -- | - class: title - - That's all folks!
Questions? - - .small[.small[ - - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo)) — [@docker](https://twitter.com/docker) - - ]] +- common/thankyou.md diff --git a/slides/lisa.yml b/slides/lisa.yml index 7191e72b..6b09eb30 100644 --- a/slides/lisa.yml +++ b/slides/lisa.yml @@ -2,7 +2,6 @@ title: "LISA17 T9: Build, Ship, and Run Microservices on a Docker Swarm Cluster" chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171031-sanfrancisco)" - exclude: - self-paced - snap @@ -12,88 +11,12 @@ exclude: - prom-manual chapters: -- | - class: title - - .small[ - - LISA17 T9 - - Build, Ship, and Run Microservices on a Docker Swarm Cluster - - .small[.small[ - - **Be kind to the WiFi!** - - *Use the 5G network* -
- *Don't use your hotspot* -
- *Don't stream videos from YouTube, Netflix, etc. -
(if you're bored, watch local content instead)* - - - - Thank you! - - ] - ] - ] - - --- - - ## Intros - - - Hello! We are - AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI) - & - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.) - - -- - - - This is our collective Docker knowledge: - - ![Bell Curve](images/bell-curve.jpg) - - --- - - ## Logistics - - - The tutorial will run from 1:30pm to 5:00pm - - - This will be fast-paced, but DON'T PANIC! - - - There will be a coffee break at 3:00pm -
- (please remind us if we forget about it!) - - - Feel free to interrupt for questions at any time - - - All the content is publicly available (slides, code samples, scripts) - - One URL to remember: http://container.training - - - Live feedback, questions, help on @@CHAT@@ - +- common/title.md +- common/logistics.md - swarm/intro.md -- | - @@TOC@@ +- common/toc.md - - swarm/prereqs.md - swarm/versions.md - - | - class: title - - All right! -
- We're all set. -
- Let's do this. - common/sampleapp.md - swarm/swarmkit.md - swarm/creatingswarm.md @@ -117,20 +40,4 @@ chapters: #- swarm/stateful.md #- swarm/extratips.md - swarm/end.md -- | - class: title - - That's all folks!
Questions? - - .small[.small[ - - AJ ([@s0ulshake](https://twitter.com/s0ulshake)) — [@TravisCI](https://twitter.com/travisci) - - Jérôme ([@jpetazzo](https://twitter.com/jpetazzo)) — [@Docker](https://twitter.com/docker) - - ]] - - +- common/thankyou.md diff --git a/slides/markmaker.py b/slides/markmaker.py index a98b21f0..06ca0ee9 100755 --- a/slides/markmaker.py +++ b/slides/markmaker.py @@ -81,11 +81,13 @@ def generatefromyaml(manifest, filename): ".debug[{}\n\nThese sides have been built from commit: {}\n\n".format(dirtyfiles, commit), 1) + markdown = markdown.replace("@@TITLE@@", manifest["title"].replace("\n", "
")) + html = open("workshop.html").read() html = html.replace("@@MARKDOWN@@", markdown) html = html.replace("@@EXCLUDE@@", exclude) html = html.replace("@@CHAT@@", manifest["chat"]) - html = html.replace("@@TITLE@@", manifest["title"]) + html = html.replace("@@TITLE@@", manifest["title"].replace("\n", " ")) return html diff --git a/slides/selfpaced.yml b/slides/selfpaced.yml index 6e0ebc74..bcc36585 100644 --- a/slides/selfpaced.yml +++ b/slides/selfpaced.yml @@ -1,27 +1,19 @@ +title: | + Docker + Orchestration + Workshop + +chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" + exclude: - in-person -chat: FIXME - -title: Docker Orchestration Workshop - chapters: -- | - class: title - Docker
Orchestration
Workshop +- common/title.md - swarm/intro.md -- | - @@TOC@@ +- common/toc.md - - swarm/prereqs.md - swarm/versions.md - - | - class: title - - All right! -
- We're all set. -
- Let's do this. - | name: part-1 @@ -29,16 +21,18 @@ chapters: Part 1 - common/sampleapp.md - - | - class: title - - Scaling out - swarm/swarmkit.md - swarm/creatingswarm.md - swarm/machine.md - swarm/morenodes.md - - swarm/firstservice.md - swarm/ourapponswarm.md + - | + name: part-2 + + class: title, self-paced + + Part 2 - - swarm/operatingswarm.md - swarm/netshoot.md - swarm/swarmnbt.md @@ -59,7 +53,4 @@ chapters: - swarm/stateful.md - swarm/extratips.md - swarm/end.md -- | - class: title - - Thank you! +- common/thankyou.md diff --git a/slides/swarm/operatingswarm.md b/slides/swarm/operatingswarm.md index 9f3d76f1..0289c1ac 100644 --- a/slides/swarm/operatingswarm.md +++ b/slides/swarm/operatingswarm.md @@ -1,20 +1,6 @@ -class: title, in-person - -Operating the Swarm - ---- - -name: part-2 - -class: title, self-paced - -Part 2 - ---- - class: self-paced -## Before we start ... +## Before we continue ... The following exercises assume that you have a 5-nodes Swarm cluster.