Merge branch 'master' into qconsf2017swarm

slides/common/intro.md

@@ -55,4 +55,4 @@ class: self-paced
 
 --
 
-.footnote[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]
+.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]

slides/common/sampleapp.md

@@ -84,7 +84,7 @@ https://github.com/jpetazzo/container.training/blob/8279a3bce9398f7c1a53bdd95187
 
 --
 
-- It is a DockerCoin miner! 💰🐳📦🚢
+- It is a DockerCoin miner! .emoji[💰🐳📦🚢]
 
 --
 

slides/find-non-ascii.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+grep --color=auto -P -n "[^\x00-\x80]" */*.md

slides/index.html

@@ -68,22 +68,23 @@
 
         <!--
             <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>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>
-            <td><a class="attend" href="https://qconsf.com/sf2017/workshop/introduction-docker-and-containers" /></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="attend" href="https://qconsf.com/sf2017/workshop/orchestrating-microservices-docker-swarm" /></td>
-        </tr>
-
-        <tr><td class="title" colspan="4">Past workshops</td></tr>
-
         <tr>
             <td>LISA17 M7: Getting Started with Docker and Containers</td>
             <td><a class="slides" href="http://lisa17m7.container.training/" /></td>

slides/interstitials.txt

@@ -1,10 +1,15 @@
-https://static.pexels.com/photos/163726/belgium-antwerp-shipping-container-163726.jpeg
-https://cdn.pixabay.com/photo/2017/03/12/06/18/container-2136505_1280.jpg
-http://www.publicdomainpictures.net/pictures/100000/velka/blue-containers.jpg
-https://media.defense.gov/2013/Nov/12/2000897311/-1/-1/0/131108-F-PD986-087.JPG
-https://upload.wikimedia.org/wikipedia/commons/4/4d/Locomotive_4700_with_a_container_train_at_Concordancia_de_Poceirao.jpg
-https://upload.wikimedia.org/wikipedia/commons/7/7e/ShippingContainerSFBay.jpg
-https://upload.wikimedia.org/wikipedia/commons/c/c7/Copper_%26_Kings_Distillery_Shipping_Containers.jpg
-https://cdn.pixabay.com/photo/2017/08/01/21/54/container-2568197_1280.jpg
-http://s0.geograph.org.uk/geophotos/05/04/71/5047160_cc034d65.jpg
-https://c1.staticflickr.com/2/1513/25530579783_57d6dd3d9c_b.jpg
+https://gallant-turing-d0d520.netlify.com/containers/Container-Ship-Freighter-Navigation-Elbe-Romance-1782991.jpg
+https://gallant-turing-d0d520.netlify.com/containers/ShippingContainerSFBay.jpg
+https://gallant-turing-d0d520.netlify.com/containers/aerial-view-of-containers.jpg
+https://gallant-turing-d0d520.netlify.com/containers/blue-containers.jpg
+https://gallant-turing-d0d520.netlify.com/containers/chinook-helicopter-container.jpg
+https://gallant-turing-d0d520.netlify.com/containers/container-cranes.jpg
+https://gallant-turing-d0d520.netlify.com/containers/container-housing.jpg
+https://gallant-turing-d0d520.netlify.com/containers/containers-by-the-water.jpg
+https://gallant-turing-d0d520.netlify.com/containers/distillery-containers.jpg
+https://gallant-turing-d0d520.netlify.com/containers/lots-of-containers.jpg
+https://gallant-turing-d0d520.netlify.com/containers/plastic-containers.JPG
+https://gallant-turing-d0d520.netlify.com/containers/train-of-containers-1.jpg
+https://gallant-turing-d0d520.netlify.com/containers/train-of-containers-2.jpg
+https://gallant-turing-d0d520.netlify.com/containers/two-containers-on-a-truck.jpg
+https://gallant-turing-d0d520.netlify.com/containers/wall-of-containers.jpeg

slides/intro/Building_Images_Interactively.md

@@ -131,7 +131,7 @@ root@fcfb62f0bfde:/# figlet hello
 |_| |_|\___|_|_|\___/ 
 ```
 
-It works! 🎉
+It works! .emoji[🎉]
 
 ---
 

slides/intro/Building_Images_With_Dockerfiles.md

@@ -188,7 +188,7 @@ root@91f3c974c9a1:/# figlet hello
 ```
 
 
-Yay! 🎉
+Yay! .emoji[🎉]
 
 ---
 

slides/intro/First_Containers.md

@@ -106,7 +106,7 @@ root@04c0bb0a6c07:/# figlet hello
 |_| |_|\___|_|_|\___/ 
 ```
 
-Beautiful! 😍
+Beautiful! .emoji[😍]
 
 ---
 

slides/logistics.md

@@ -2,9 +2,9 @@
 
  - Hello! We are:
 
-   - 👷🏻‍♀️ AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
+   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
 
-   - 🐳 Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
+   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
 
 - The workshop will run from 9am to 4pm
 

slides/markmaker.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # transforms a YAML manifest into a HTML workshop file
 
 import glob

slides/swarm/creatingswarm.md

@@ -179,7 +179,7 @@ ID             HOSTNAME  STATUS  AVAILABILITY  MANAGER STATUS
 
 --
 
-- Don't panic, we can easily see it again 😏
+- Don't panic, we can easily see it again .emoji[😏]
 
 ---
 

slides/swarm/swarmkit.md

@@ -9,7 +9,7 @@
 
 --
 
-.footnote[🐳 Did you know that кит means "whale" in Russian?]
+.footnote[.emoji[🐳] Did you know that кит means "whale" in Russian?]
 
 ---
 

slides/workshop.css

@@ -10,6 +10,10 @@
   font-size: 25px !important;
 }
 
+.emoji {
+  font-family: 'EmojiOne Color';
+}
+
 h1, h2, h3, h4, h5, h6 {
   font-family: 'Droid Serif';
   font-weight: bold;