Merge pull request #32 from everett-toews/github-docs

Move slides to docs for GitHub Pages

README.md

@@ -17,16 +17,11 @@ at multiple conferences and events like:
 
 ## Slides
 
-The slides are in the `www/htdocs` directory.
+The slides are in the `docs` directory.
 
-The recommended way to view them is to:
-
-- have a Docker host
-- clone this repository to your Docker host
-- `cd www && docker-compose up -d`
-- this will start a web server on port 80
-- point your browser at your Docker host and enjoy
+To view them locally open `docs/index.html` in your browser.
 
+To view them online open https://jpetazzo.github.io/orchestration-workshop/ in your browser.
 
 ## Sample code
 

docs/index.html

@@ -143,7 +143,7 @@ Remember to change:
 - the "tweet my speed" hashtag in DockerCoins HTML
 -->
 
-- Live feedback, questions, help on 
+- Live feedback, questions, help on
   [Gitter](http://container.training/chat)
 
 ---
@@ -1509,9 +1509,9 @@ If we wanted to use DTR, we would:
   <br/>(but you can add a config file to use S3, Swift, etc.)
 
 - Docker *requires* TLS when communicating with the registry
-  
+
   - unless for registries on `localhost`
-  
+
   - or with the Engine flag `--insecure-registry`
 
 - Our strategy: publish the registry container on port 5000,
@@ -2500,7 +2500,7 @@ What we will do:
 
 - It needs a tiny bit of configuration: the address of the ElasticSearch service
 
-- We don't want Kibana logs to show up in Kibana (it would create clutter) 
+- We don't want Kibana logs to show up in Kibana (it would create clutter)
   <br/>so we tell Logspout to ignore them
 
 .exercise[
@@ -2574,10 +2574,10 @@ What we will do:
 You should see the heartbeat messages:
 .small[
 ```json
-{      "message" => "ok", 
-          "host" => "1a4cfb063d13", 
-      "@version" => "1", 
-    "@timestamp" => "2016-06-19T00:45:45.273Z" 
+{      "message" => "ok",
+          "host" => "1a4cfb063d13",
+      "@version" => "1",
+    "@timestamp" => "2016-06-19T00:45:45.273Z"
 }
 ```
 ]
@@ -3391,7 +3391,7 @@ docker node update <node-name> --availability <active|pause|drain>
 
   You can use it to troubleshoot a node without disrupting existing tasks
 
-  It can also be used (in conjunction with labels) to reserve resources 
+  It can also be used (in conjunction with labels) to reserve resources
 
 - Drain = don't schedule new tasks on this node; existing tasks are moved away
 
@@ -3449,7 +3449,7 @@ class: title
 ## [@jpetazzo](https://twitter.com/jpetazzo) <br/> [@docker](https://twitter.com/docker)
 
     </textarea>
-    <script src="https://gnab.github.io/remark/downloads/remark-0.13.min.js" type="text/javascript">
+    <script src="remark-0.13.min.js" type="text/javascript">
     </script>
     <script type="text/javascript">
       var slideshow = remark.create({

www/docker-compose.yml

@@ -1,9 +0,0 @@
-version: "2"
-
-services:
-    www:
-      image: nginx
-      ports:
-        - "8080:80"
-      volumes:
-        - "./htdocs:/usr/share/nginx/html"