diff --git a/slides/common/intro.md b/slides/common/intro.md index 51b8065a..7110ab65 100644 --- a/slides/common/intro.md +++ b/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.] diff --git a/slides/common/sampleapp.md b/slides/common/sampleapp.md index b689c2e1..b407fb06 100644 --- a/slides/common/sampleapp.md +++ b/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[πŸ’°πŸ³πŸ“¦πŸš’] -- diff --git a/slides/find-non-ascii.sh b/slides/find-non-ascii.sh new file mode 100755 index 00000000..12d15290 --- /dev/null +++ b/slides/find-non-ascii.sh @@ -0,0 +1,2 @@ +#!/bin/sh +grep --color=auto -P -n "[^\x00-\x80]" */*.md diff --git a/slides/index.html b/slides/index.html index da9d4da3..2cd7da40 100644 --- a/slides/index.html +++ b/slides/index.html @@ -68,22 +68,23 @@ + + + QCON SF: Orchestrating Microservices with Docker Swarm + + + + + Past workshops QCON SF: Introduction to Docker and Containers - - - QCON SF: Orchestrating Microservices with Docker Swarm - - - - - Past workshops - LISA17 M7: Getting Started with Docker and Containers diff --git a/slides/interstitials.txt b/slides/interstitials.txt index f2225ee9..f174d807 100644 --- a/slides/interstitials.txt +++ b/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 diff --git a/slides/intro/Building_Images_Interactively.md b/slides/intro/Building_Images_Interactively.md index ff984679..59a9f124 100644 --- a/slides/intro/Building_Images_Interactively.md +++ b/slides/intro/Building_Images_Interactively.md @@ -131,7 +131,7 @@ root@fcfb62f0bfde:/# figlet hello |_| |_|\___|_|_|\___/ ``` -It works! πŸŽ‰ +It works! .emoji[πŸŽ‰] --- diff --git a/slides/intro/Building_Images_With_Dockerfiles.md b/slides/intro/Building_Images_With_Dockerfiles.md index fee21e92..13e7f531 100644 --- a/slides/intro/Building_Images_With_Dockerfiles.md +++ b/slides/intro/Building_Images_With_Dockerfiles.md @@ -188,7 +188,7 @@ root@91f3c974c9a1:/# figlet hello ``` -Yay! πŸŽ‰ +Yay! .emoji[πŸŽ‰] --- diff --git a/slides/intro/First_Containers.md b/slides/intro/First_Containers.md index ee717190..72cb3e5c 100644 --- a/slides/intro/First_Containers.md +++ b/slides/intro/First_Containers.md @@ -106,7 +106,7 @@ root@04c0bb0a6c07:/# figlet hello |_| |_|\___|_|_|\___/ ``` -Beautiful! 😍 +Beautiful! .emoji[😍] --- diff --git a/slides/logistics.md b/slides/logistics.md index 7a89c46e..fea20340 100644 --- a/slides/logistics.md +++ b/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 diff --git a/slides/markmaker.py b/slides/markmaker.py index d7ef7a03..a29ba38a 100755 --- a/slides/markmaker.py +++ b/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 diff --git a/slides/swarm/creatingswarm.md b/slides/swarm/creatingswarm.md index 198d778f..f9e3340f 100644 --- a/slides/swarm/creatingswarm.md +++ b/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[😏] --- diff --git a/slides/swarm/swarmkit.md b/slides/swarm/swarmkit.md index acee6dbd..04f4882c 100644 --- a/slides/swarm/swarmkit.md +++ b/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?] --- diff --git a/slides/workshop.css b/slides/workshop.css index 143467ef..88f707c3 100644 --- a/slides/workshop.css +++ b/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;