fix-redirects.sh: adding forced redirect

slides/_redirects

@@ -0,0 +1 @@
+/ /kube-halfday.yml.html 200!

slides/common/title.md

@@ -8,14 +8,8 @@ class: title, self-paced
 
 class: title, in-person
 
-@@TITLE@@<br/></br>
+Docker + Kubernetes = ❤️<br/></br>
 
 .footnote[
-**Be kind to the WiFi!**<br/>
-<!-- *Use the 5G network.* -->
-*Don't use your hotspot.*<br/>
-*Don't stream videos or download big files during the workshop.*<br/>
-*Thank you!*
-
-**Slides: http://container.training/**
+**Slides: http://kube.container.training/**
 ]

slides/index.html

@@ -66,20 +66,29 @@
 
         <tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
 
-        <!--
-            <td><a class="chat" href="https://gitter.im/jpetazzo/workshop-20171026-prague" /></td>
-            <td><a class="attend" href="https://qconsf.com/sf2017/workshop/orchestrating-microservices-docker-swarm" /></td>
+        <tr>
+            <td>Kubernetes enablement at Docker</td>
+            <td><a class="slides" href="http://kube.container.training/" /></td>
+            <td><a class="chat" href="https://docker.slack.com/messages/C83M572J2" /></td>
+        </tr>
 
+            <!--
+            <td><a class="attend" href="https://qconsf.com/sf2017/workshop/orchestrating-microservices-docker-swarm" /></td>
+            -->
+
+        <!--
+        <tr>
+            <td>Nothing for now (stay tuned...)</td>
+        </tr>
         -->
         
+        <tr><td class="title" colspan="4">Past workshops</td></tr>
+
         <tr>
             <td>QCON SF: Orchestrating Microservices with Docker Swarm</td>
             <td><a class="slides" href="http://qconsf2017swarm.container.training/" /></td>
-            <td><a class="chat" href="https://gitter.im/jpetazzo/workshop-20171117-sanfrancisco" /></td>
         </tr>
 
-        <tr><td class="title" colspan="4">Past workshops</td></tr>
-
         <tr>
             <td>QCON SF: Introduction to Docker and Containers</td>
             <td><a class="slides" href="http://qconsf2017intro.container.training/" /></td>

slides/kube-halfday.yml

@@ -1,8 +1,7 @@
 title: |
-  Deploying and Scaling Microservices
-  with Docker and Kubernetes
+  Docker + Kubernetes = <3
 
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+chat: "[Slack](https://docker.slack.com/messages/C83M572J2)"
 #chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
 
 exclude:

slides/kube/versions-k8s.md

@@ -1,8 +1,8 @@
 ## Brand new versions!
 
 - Kubernetes 1.8
-- Docker Engine 17.10
-- Docker Compose 1.16
+- Docker Engine 17.11
+- Docker Compose 1.17
 
 
 .exercise[

slides/logistics.md

@@ -1,19 +1,19 @@
-## Intros
+## Logistics
 
- - Hello! We are:
+- Hi!
 
-   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
+- This will run from 9am to 1:30pm
 
-   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
+- We'll have a coffee break around 10:30am
 
-- The workshop will run from 9am to 4pm
+- Food will be served (to be confirmed)
 
-- There will be a lunch break at noon
+- Feel free (please do) interrupt me to ask questions
 
-  (And coffee breaks!)
+- There is a Slack channel for questions: #kube
 
-- Feel free to interrupt for questions at any time
+- Chapters are separated by pictures of containers
 
-- *Especially when you see full screen container pictures!*
+- The slides are targeting a wide audience
 
-- Live feedback, questions, help on @@CHAT@@
+  (i.e. people who might not have the Docker expertise that you have)