From c6e5370975768f581a5b994c2fac0cb982f63f12 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 3 Jan 2019 15:59:37 -0600
Subject: [PATCH] Compile deck for January container training

---
 slides/_redirects        |  1 +
 slides/intro-fullday.yml | 48 ++++++++++++++++++++++++++++++----------
 slides/logistics.md      | 18 +++------------
 slides/shared/title.md   |  3 ++-
 4 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100644 slides/_redirects

diff --git a/slides/_redirects b/slides/_redirects
new file mode 100644
index 00000000..3a87c3f8
--- /dev/null
+++ b/slides/_redirects
@@ -0,0 +1 @@
+/ /intro-fullday.yml.html 200
diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml
index 7dee3550..dcca59ef 100644
--- a/slides/intro-fullday.yml
+++ b/slides/intro-fullday.yml
@@ -2,12 +2,11 @@ title: |
   Introduction
   to Containers
 
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+chat: "[Gitter](https://gitter.im/enix/formation-docker-20190107)"
 gitrepo: github.com/jpetazzo/container.training
 
-slides: http://container.training/
+slides: http://intro-2019-01.container.training/
 
 exclude:
 - self-paced
@@ -18,9 +17,9 @@ chapters:
 - containers/intro.md
 - shared/about-slides.md
 - shared/toc.md
-- - containers/Docker_Overview.md
-  - containers/Docker_History.md
-  - containers/Training_Environment.md
+#- - containers/Docker_Overview.md
+#  - containers/Docker_History.md
+- - containers/Training_Environment.md
   - containers/Installing_Docker.md
   - containers/First_Containers.md
   - containers/Background_Containers.md
@@ -29,13 +28,32 @@ chapters:
   - containers/Building_Images_Interactively.md
   - containers/Building_Images_With_Dockerfiles.md
   - containers/Cmd_And_Entrypoint.md
-  - containers/Copying_Files_During_Build.md
-- - containers/Multi_Stage_Builds.md
+- - containers/Copying_Files_During_Build.md
+  - |
+      # Exercise — writing Dockerfiles
+
+      Let's write Dockerfiles for an existing application!
+
+      The code is at: https://github.com/jpetazzo/wordsmith
+
+  - containers/Multi_Stage_Builds.md
   - containers/Publishing_To_Docker_Hub.md
   - containers/Dockerfile_Tips.md
+  - |
+      # Exercise — writing better Dockerfiles
+
+      Let's update our Dockerfiles to leverage multi-stage builds!
+
+      The code is at: https://github.com/jpetazzo/wordsmith
+
+      Use a different tag for these images, so that we can compare their sizes.
+
+      What's the size difference between single-stage and multi-stage builds?
+
 - - containers/Naming_And_Inspecting.md
   - containers/Labels.md
   - containers/Getting_Inside.md
+  - containers/Resource_Limits.md
 - - containers/Container_Networking_Basics.md
   - containers/Network_Drivers.md
   - containers/Container_Network_Model.md
@@ -45,11 +63,17 @@ chapters:
   - containers/Windows_Containers.md
   - containers/Working_With_Volumes.md
   - containers/Compose_For_Dev_Stacks.md
-  - containers/Docker_Machine.md
-- - containers/Advanced_Dockerfiles.md
+  - |
+      # Exercise — writing a Compose file
+
+      Let's write a Compose file for the wordsmith app!
+
+      The code is at: https://github.com/jpetazzo/wordsmith
+
+- - containers/Docker_Machine.md
+  - containers/Advanced_Dockerfiles.md
   - containers/Application_Configuration.md
   - containers/Logging.md
-  - containers/Resource_Limits.md
 - - containers/Namespaces_Cgroups.md
   - containers/Copy_On_Write.md
   #- containers/Containers_From_Scratch.md
diff --git a/slides/logistics.md b/slides/logistics.md
index c818d864..65342bff 100644
--- a/slides/logistics.md
+++ b/slides/logistics.md
@@ -1,26 +1,14 @@
 ## Intros
 
-- This slide should be customized by the tutorial instructor(s).
-
 - Hello! We are:
 
-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
-
-   - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
-
- <!-- .dummy[
-
-   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
-
    - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS)
 
-   - .emoji[⛵] Jérémy ([@jeremygarrouste](twitter.com/jeremygarrouste), Inpiwee)
+   - .emoji[🚁] Alexandre ([@alexbuisine](https://twitter.com/alexbuisine), Enix SAS)
 
-] -->
+- The training will run from 9:15am to 5:30pm
 
-- The workshop will run from ...
-
-- There will be a lunch break at ...
+- There will be a lunch break at noon
 
   (And coffee breaks!)
 
diff --git a/slides/shared/title.md b/slides/shared/title.md
index 4ab52435..fa437741 100644
--- a/slides/shared/title.md
+++ b/slides/shared/title.md
@@ -11,7 +11,8 @@ class: title, in-person
 @@TITLE@@<br/></br>
 
 .footnote[
-**Be kind to the WiFi!**<br/>
+**WiFi: EnixTraining**<br/>
+**Password: kubeforever**<br/>
 <!-- *Use the 5G network.* -->
 *Don't use your hotspot.*<br/>
 *Don't stream videos or download big files during the workshop[.](https://www.youtube.com/watch?v=h16zyxiwDLY)*<br/>