diff --git a/slides/swarm/intro.md b/slides/common/intro.md similarity index 68% rename from slides/swarm/intro.md rename to slides/common/intro.md index 78c32a1e..1227a6be 100644 --- a/slides/swarm/intro.md +++ b/slides/common/intro.md @@ -27,9 +27,9 @@ class: self-paced - Likewise, it will take more than merely *reading* these slides to make you an expert -- These slides include *tons* of exercises +- These slides include *tons* of exercises and examples -- They assume that you have access to a cluster of Docker nodes +- They assume that you have access to some Docker nodes - If you are attending a workshop or tutorial:
you will be given specific instructions to access your cluster @@ -39,3 +39,21 @@ class: self-paced [Play-With-Docker](http://www.play-with-docker.com/) and read [these instructions](https://github.com/jpetazzo/container.training#using-play-with-docker) for extra details + +--- + +## About these slides + +- All the content is available in a public GitHub repository: + + https://github.com/jpetazzo/container.training + +- You can get updated "builds" of the slides there: + + http://container.training/ + +- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ... + +-- + +.footnote[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.] diff --git a/slides/common/logistics.md b/slides/common/logistics.md deleted file mode 100644 index e753eff1..00000000 --- a/slides/common/logistics.md +++ /dev/null @@ -1,48 +0,0 @@ -## 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/prereqs.md b/slides/common/prereqs.md index 5b2b29f0..8d47a728 100644 --- a/slides/common/prereqs.md +++ b/slides/common/prereqs.md @@ -60,9 +60,9 @@ class: in-person ## Where are we going to run our containers? --- +--- -class: in-person +class: in-person, pic ![You get five VMs](images/you-get-five-vms.jpg) diff --git a/slides/common/title.md b/slides/common/title.md index 1b9f7beb..1d7755d4 100644 --- a/slides/common/title.md +++ b/slides/common/title.md @@ -8,13 +8,14 @@ class: title, self-paced 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.* +@@TITLE@@

+.footnote[ +**Be kind to the WiFi!**
+ +*Don't use your hotspot.*
+*Don't stream videos or download big files during the workshop.*
*Thank you!* + +**Slides: http://container.training/** +] \ No newline at end of file diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index 215d494f..d4a8f5a0 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -11,7 +11,8 @@ exclude: chapters: - common/title.md -- common/logistics.md +- logistics.md +- common/intro.md - common/toc.md - - intro/Docker_Overview.md #- intro/Docker_History.md diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml new file mode 100644 index 00000000..23cf3006 --- /dev/null +++ b/slides/intro-selfpaced.yml @@ -0,0 +1,42 @@ +title: | + Introduction + to Docker and + Containers + +chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" +#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" + +exclude: +- in-person + +chapters: +- common/title.md +# - common/logistics.md +- common/intro.md +- common/toc.md +- - intro/Docker_Overview.md + #- intro/Docker_History.md + - intro/Training_Environment.md + - intro/Installing_Docker.md + - intro/First_Containers.md + - intro/Background_Containers.md + - intro/Start_And_Attach.md +- - intro/Initial_Images.md + - intro/Building_Images_Interactively.md + - intro/Building_Images_With_Dockerfiles.md + - intro/Cmd_And_Entrypoint.md + - intro/Copying_Files_During_Build.md + - intro/Multi_Stage_Builds.md + - intro/Publishing_To_Docker_Hub.md + - intro/Dockerfile_Tips.md +- - intro/Naming_And_Inspecting.md + - intro/Container_Networking_Basics.md + - intro/Network_Drivers.md + - intro/Container_Network_Model.md + #- intro/Connecting_Containers_With_Links.md + - intro/Ambassadors.md +- - intro/Local_Development_Workflow.md + - intro/Working_With_Volumes.md + - intro/Compose_For_Dev_Stacks.md + - intro/Advanced_Dockerfiles.md + - common/thankyou.md diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml index c5cb887f..9d1ab3ee 100644 --- a/slides/kube-halfday.yml +++ b/slides/kube-halfday.yml @@ -11,8 +11,8 @@ exclude: chapters: - common/title.md -- common/logistics.md -- kube/intro-ks.md +- logistics.md +- common/intro.md - common/toc.md - - common/prereqs.md - kube/versions-k8s.md diff --git a/slides/kube/intro-ks.md b/slides/kube/intro-ks.md deleted file mode 100644 index 99cabc3e..00000000 --- a/slides/kube/intro-ks.md +++ /dev/null @@ -1,15 +0,0 @@ -## About these slides - -- Your one-stop shop to awesomeness: - - http://container.training/ - -- The content that you're viewing right now is in a public GitHub repository: - - https://github.com/jpetazzo/container.training - -- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ... - --- - -.footnote[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.] diff --git a/slides/logistics.md b/slides/logistics.md new file mode 100644 index 00000000..b5017012 --- /dev/null +++ b/slides/logistics.md @@ -0,0 +1,17 @@ +## Intros + + - Hello! We are: + + - 👷🏻‍♀️ AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI) + + - 🐳 Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.) + +- The workshop will run from 9am to 4pm + +- There will be a lunch break at noon + + (And coffee breaks!) + +- Feel free to interrupt for questions at any time + +- Live feedback, questions, help on @@CHAT@@ diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml index fde4f883..283b2242 100644 --- a/slides/swarm-fullday.yml +++ b/slides/swarm-fullday.yml @@ -15,8 +15,8 @@ exclude: chapters: - common/title.md -- common/logistics.md -- swarm/intro.md +- logistics.md +- common/intro.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml index f4693e1f..9d6a2552 100644 --- a/slides/swarm-halfday.yml +++ b/slides/swarm-halfday.yml @@ -15,8 +15,8 @@ exclude: chapters: - common/title.md -- common/logistics.md -- swarm/intro.md +- logistics.md +- common/intro.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml index eafac53c..56d59c46 100644 --- a/slides/swarm-selfpaced.yml +++ b/slides/swarm-selfpaced.yml @@ -11,7 +11,7 @@ exclude: chapters: - common/title.md #- common/logistics.md -- swarm/intro.md +- common/intro.md - common/toc.md - - common/prereqs.md - swarm/versions.md diff --git a/slides/workshop.css b/slides/workshop.css index e497b5b5..7c03d8c0 100644 --- a/slides/workshop.css +++ b/slides/workshop.css @@ -81,7 +81,10 @@ a { .footnote { position: absolute; - bottom: 3em; + bottom: 1em; +} +span.footnote { + bottom: 2em; } .red { color: #fa0000; } @@ -124,6 +127,7 @@ div.title > p:first-child { font-size: 300%; } +/* "Normal" images (not on title or pic slides) shouldn't be too big */ div img { max-width: 1210px; max-height: 250px;