Adjust content

slides/logistics-template.md

@@ -1,32 +1,14 @@
 ## Intros
 
-- This slide should be customized by the tutorial instructor(s).
+- Hello! I'm Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo))
 
-- Hello! We are:
+- The workshop will run Monday through Friday:
 
-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
+  - 8am-noon (PST / Pacific time)
 
-   - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
+  - 17:00-21:00 (CET / European time)
 
- <!-- .dummy[
-
-   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
-
-   - .emoji[🚁] Alexandre ([@alexbuisine](https://twitter.com/alexbuisine), Enix SAS)
-
-   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS)
-
-   - .emoji[⛵] Jérémy ([@jeremygarrouste](twitter.com/jeremygarrouste), Inpiwee)
-
-   - .emoji[🎧] Romain ([@rdegez](https://twitter.com/rdegez), Enix SAS)
-
-] -->
-
-- The workshop will run from ...
-
-- There will be a lunch break at ...
-
-  (And coffee breaks!)
+- There will be a short break every hour, and a longer break in the middle
 
 - Feel free to interrupt for questions at any time
 

slides/outreach.yml

@@ -39,12 +39,9 @@ content:
   - containers/Copying_Files_During_Build.md
   - containers/Exercise_Dockerfile_Basic.md
 - #3
-  - containers/Dockerfile_Tips.md
-  - containers/Multi_Stage_Builds.md
-  - containers/Exercise_Dockerfile_Advanced.md
   - containers/Container_Networking_Basics.md
-  - containers/Network_Drivers.md
-  #- containers/Container_Network_Model.md
+  #- containers/Network_Drivers.md
+  - containers/Container_Network_Model.md
 - #4
   - |
     # Kubernetes
@@ -99,12 +96,18 @@ content:
   - k8s/ingress.md
   - k8s/authn-authz.md
 - #9
-  - k8s/volumes.md
-  - k8s/configuration.md
-  - k8s/statefulsets.md
-- #10
   - k8s/resource-limits.md
   - k8s/metrics-server.md
   - k8s/cluster-sizing.md
   - k8s/horizontal-pod-autoscaler.md
   - shared/thankyou.md
+- #10
+  - k8s/volumes.md
+  - k8s/configuration.md
+  - k8s/statefulsets.md
+- # Extra
+  - |
+    # (Extra content)
+  - containers/Dockerfile_Tips.md
+  - containers/Multi_Stage_Builds.md
+  - containers/Exercise_Dockerfile_Advanced.md