Compare commits

...

10 Commits

Author SHA1 Message Date
Jerome Petazzoni
62e0adcd7a fix-redirects.sh: adding forced redirect 2020-04-07 16:57:02 -05:00
Jérôme Petazzoni
6afabd7914 Merge branch 'master' into qconsf2017swarm 2017-11-16 23:32:23 -08:00
Jérôme Petazzoni
7856e8c5f2 Put chat room in index 2017-11-16 23:32:12 -08:00
Jérôme Petazzoni
69bafe332f Update interstitials with self-hosted version 2017-11-16 23:29:37 -08:00
Jérôme Petazzoni
e2b24a20d2 Remove pixabay for now: 2017-11-16 08:46:47 -08:00
Jérôme Petazzoni
40be1cb803 Update chat link 2017-11-13 22:43:41 -08:00
Jérôme Petazzoni
b3ed112667 Merge branch 'master' into qconsf2017swarm 2017-11-13 22:42:45 -08:00
Jérôme Petazzoni
c367ed2fc7 Use a rewrite rule instead of a redirect 2017-11-10 23:09:46 -08:00
Jérôme Petazzoni
ad26357e4f Merge branch 'master' into qconsf2017swarm 2017-11-10 22:58:53 -08:00
Jérôme Petazzoni
84fdbd77d7 Setup QCON2017 swarm workshop branch 2017-11-10 22:53:18 -08:00
4 changed files with 27 additions and 21 deletions

1
slides/_redirects Normal file
View File

@@ -0,0 +1 @@
/ /swarm-fullday.yml.html 200!

View File

@@ -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>

View File

@@ -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

View File

@@ -2,8 +2,7 @@ title: |
Container Orchestration
with Docker and Swarm
chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
chat: "[Gitter](https://gitter.im/jpetazzo/workshop-20171117-sanfrancisco)"
exclude:
- self-paced