fix-redirects.sh: adding forced redirect

bring branch up to date

CHECKLIST.md

@@ -1,19 +1,24 @@
-This is the checklist that I (Jérôme) use when delivering a workshop.
+Checklist to use when delivering a workshop
+Authored by Jérôme; additions by Bridget
 
-- [ ] Create branch + `_redirects` + push to GitHub + Netlify setup
-- [ ] Add branch to index.html
-- [ ] Update the slides that says which versions we are using
-- [ ] Update the version of Compose and Machine in settings
-- [ ] Create chatroom
-- [ ] Set chatroom in YML and deploy
-- [ ] Put chat room in index.html
-- [ ] Walk the room to count seats, check power supplies, lectern, A/V setup
-- [ ] How many VMs do we need?
-- [ ] Provision VMs
+- [ ] Create event-named branch (such as `conferenceYYYY`) in the [main repo](https://github.com/jpetazzo/container.training/)
+  - [ ] Create file `slides/_redirects` containing a link to the desired tutorial: `/ /kube-halfday.yml.html 200`
+  - [ ] Push local branch to GitHub and merge into main repo
+  - [ ] [Netlify setup](https://app.netlify.com/sites/container-training/settings/domain): create subdomain for event-named branch
+- [ ] Add link to event-named branch to [container.training front page](https://github.com/jpetazzo/container.training/blob/master/slides/index.html)
+- [ ] Update the slides that says which versions we are using for [kube](https://github.com/jpetazzo/container.training/blob/master/slides/kube/versions-k8s.md) or [swarm](https://github.com/jpetazzo/container.training/blob/master/slides/swarm/versions.md) workshops
+- [ ] Update the version of Compose and Machine in [settings](https://github.com/jpetazzo/container.training/tree/master/prepare-vms/settings)
+- [ ] (optional) Create chatroom
+- [ ] (optional) Set chatroom in YML ([kube half-day example](https://github.com/jpetazzo/container.training/blob/master/slides/kube-halfday.yml#L6-L8)) and deploy
+- [ ] (optional) Put chat link on [container.training front page](https://github.com/jpetazzo/container.training/blob/master/slides/index.html)
+- [ ] How many VMs do we need? Check with event organizers ahead of time
+- [ ] Provision VMs (slightly more than we think we'll need)
+- [ ] Change password on presenter's VMs (to forestall any hijinx)
+- [ ] Onsite: walk the room to count seats, check power supplies, lectern, A/V setup
 - [ ] Print cards
 - [ ] Cut cards
-- [ ] Last minute merge from master
+- [ ] Last-minute merge from master
 - [ ] Check that all looks good
 - [ ] DELIVER!
-- [ ] Shutdown VMs
+- [ ] Shut down VMs
 - [ ] Update index.html to remove chat link and move session to past things

prepare-vms/lib/commands.sh

@@ -132,7 +132,7 @@ _cmd_kube() {
     sudo apt-key add - &&
     echo deb http://apt.kubernetes.io/ kubernetes-xenial main |
     sudo tee /etc/apt/sources.list.d/kubernetes.list"
-    pssh "
+    pssh --timeout 200 "
     sudo apt-get update -q &&
     sudo apt-get install -qy kubelet kubeadm kubectl
     kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl"
@@ -177,7 +177,9 @@ _cmd_kubetest() {
     # Feel free to make that better ♥
     pssh "
     set -e
+    [ -f /tmp/node ]
     if grep -q node1 /tmp/node; then
+      which kubectl
       for NODE in \$(awk /\ node/\ {print\ \\\$2} /etc/hosts); do
         echo \$NODE ; kubectl get nodes | grep -w \$NODE | grep -w Ready
       done

slides/_redirects

@@ -1 +1 @@
-/* http://paris-container-training.netlify.com/:splat 200!
+/ /kube-halfday.yml.html 200!

slides/index.html

@@ -64,7 +64,7 @@
     <table>
         <tr><td class="header" colspan="4">Container Training</td></tr>
 
-        <tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>
+        <tr><td class="title" colspan="4">Coming soon near you</td></tr>
 
         <tr>
 	    <!--
@@ -72,7 +72,7 @@
 thing for now (stay tuned...)</td>
              -->
             <td>March 14, 2018: Boosterconf — Kubernetes 101</td>
-            <td>&nbsp;</td>
+            <td><a class="slides" href="http://boosterconf2018.container.training/" /></td>
             <td><a class="attend" href="https://2018.boosterconf.no/talks/1179" />
         </tr>
 
@@ -82,6 +82,17 @@ thing for now (stay tuned...)</td>
             <td><a class="attend" href="https://www.usenix.org/conference/srecon18americas/presentation/kromhout" />
         </tr>
 
+        <tr>
+            <td>April 11-12, 2018: Introduction aux conteneurs (in French)</td>
+            <td>&nbsp;</td>
+            <td><a class="attend" href="http://paris.container.training/intro.html" />
+        </tr>
+
+        <tr>
+            <td>April 13, 2018: Introduction à l'orchestration (in French)</td>
+            <td>&nbsp;</td>
+            <td><a class="attend" href="http://paris.container.training/kube.html" />
+        </tr>
 
         <tr><td class="title" colspan="4">Past workshops</td></tr>
 

slides/intro/Advanced_Dockerfiles.md

@@ -94,8 +94,6 @@ RUN apt-get update && apt-get install -y wget && apt-get clean
 
 It is also possible to break a command onto multiple lines:
 
-It is possible to execute multiple commands in a single step:
-
 ```dockerfile
 RUN apt-get update \
  && apt-get install -y wget \

slides/intro/Container_Network_Model.md

@@ -434,7 +434,7 @@ When creating a network, extra options can be provided.
 
 * `--internal` disables outbound traffic (the network won't have a default gateway).
 
-* `--gateway` indicates which address to use for the gateway (when utbound traffic is allowed).
+* `--gateway` indicates which address to use for the gateway (when outbound traffic is allowed).
 
 * `--subnet` (in CIDR notation) indicates the subnet to use.
 

slides/intro/Copying_Files_During_Build.md

@@ -93,7 +93,7 @@ Success!
 * Older Dockerfiles also have the `ADD` instruction.
   <br/>It is similar but can automatically extract archives.
 
-* If we really wanted to compile C code in a compiler, we would:
+* If we really wanted to compile C code in a container, we would:
 
   * Place it in a different directory, with the `WORKDIR` instruction.
 

slides/intro/intro.md

@@ -1,7 +1,8 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
-  instructor-led workshops and tutorials
+- This was initially written to support in-person, instructor-led workshops and tutorials
+
+- These materials are maintained by [Jérôme Petazzoni](https://twitter.com/jpetazzo) and [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors)
 
 - You can also follow along on your own, at your own pace
 

slides/kube-halfday.yml

@@ -1,6 +1,5 @@
 title: |
-  Deploying and Scaling Microservices
-  with Kubernetes
+  Kubernetes 101
 
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
@@ -12,7 +11,7 @@ exclude:
 
 chapters:
 - common/title.md
-- logistics.md
+- logistics-bridget.md
 - kube/intro.md
 - common/about-slides.md
 - common/toc.md
@@ -36,4 +35,4 @@ chapters:
   - kube/rollout.md
   - kube/whatsnext.md
   - common/thankyou.md
-  - kube/links.md
+  - kube/links-bridget.md

slides/kube/dashboard.md

@@ -87,6 +87,17 @@ The goo.gl URL expands to:
 
 ## Connecting to the dashboard
 
+.exercise[
+
+- Check which port the dashboard is on:
+  ```bash
+  kubectl -n kube-system get svc socat
+  ```
+
+]
+
+You'll want the `3xxxx` port.
+
 
 .exercise[
 
@@ -164,7 +175,7 @@ The dashboard will then ask you which authentication you want to use.
 
 ## Editing the `kubernetes-dashboard` service
 
-- If we look at the YAML that we loaded just before, we'll get a hint
+- If we look at the [YAML](https://goo.gl/Qamqab) that we loaded before, we'll get a hint
 
 --
 
@@ -183,6 +194,8 @@ The dashboard will then ask you which authentication you want to use.
 
 - Check the port that was assigned with `kubectl -n kube-system get services`
 
+- Connect to https://oneofournodes:3xxxx/ (yes, https)
+
 ]
 
 ---

slides/kube/intro.md

@@ -1,7 +1,9 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
+- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person,
   instructor-led workshops and tutorials
+  
+- Credit is also due to [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) — thank you!
 
 - You can also follow along on your own, at your own pace
 

slides/kube/versions-k8s.md

@@ -1,7 +1,7 @@
 ## Versions installed
 
-- Kubernetes 1.9.3
-- Docker Engine 18.02.0-ce
+- Kubernetes 1.9.4
+- Docker Engine 18.03.0-ce-rc3
 - Docker Compose 1.18.0
 
 

slides/swarm/intro.md

@@ -1,7 +1,9 @@
 ## A brief introduction
 
-- This was initially written to support in-person,
+- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person,
   instructor-led workshops and tutorials
+  
+- Over time, [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) also helped to improve these materials — thank you!
 
 - You can also follow along on your own, at your own pace