From 60524d2ff36f05d4d52f233805863fd411dbb581 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Sun, 19 Jun 2016 00:07:19 -0700
Subject: [PATCH] Fixes

---
 prepare-vms/settings/rc.yaml |  6 +--
 www/htdocs/index.html        | 83 +++++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/prepare-vms/settings/rc.yaml b/prepare-vms/settings/rc.yaml
index 24436500..8284aa36 100644
--- a/prepare-vms/settings/rc.yaml
+++ b/prepare-vms/settings/rc.yaml
@@ -30,6 +30,6 @@ footer: >
 url: http://container.training/
 
 engine_version: test.docker.com
-compose_version: 1.7.0-rc2
-machine_version: 0.7.0-rc1
-swarm_version: 1.2.0-rc2
+compose_version: 1.8.0-rc1
+machine_version: 0.8.0-rc1
+swarm_version: latest
diff --git a/www/htdocs/index.html b/www/htdocs/index.html
index e66a46af..5cf27a42 100644
--- a/www/htdocs/index.html
+++ b/www/htdocs/index.html
@@ -352,10 +352,8 @@ You are welcome to use the method that you feel the most comfortable with.
 
 ## Brand new versions!
 
-- Engine 1.12-rc-something
-- Compose 1.7
-- Swarm 1.2
-- Machine 0.6
+- Engine 1.12-rc2
+- Compose 1.8-rc1
 
 .exercise[
 
@@ -363,8 +361,6 @@ You are welcome to use the method that you feel the most comfortable with.
   ```bash
   docker version
   docker-compose -v
-  docker run --rm swarm -version
-  docker-machine -v
   ```
 
 ]
@@ -476,6 +472,7 @@ class: pic
 - Clone the repository on `node1`:
   ```bash
   git clone git://github.com/jpetazzo/orchestration-workshop
+  git checkout dockercon
   ```
 
 ]
@@ -763,6 +760,21 @@ Note: this is a fiction! We have enough entropy. But we need a pretext to scale
 
 ---
 
+## Clean up
+
+- Before moving on, let's remove those containers
+
+.exercise[
+
+- Tell Compose to remove everything:
+  ```bash
+  docker-compose down
+  ```
+
+]
+
+---
+
 class: title
 
 # Scaling out
@@ -1155,7 +1167,7 @@ As we could see, nodes can join automatically or be approved manually; in both c
 
 - Promote a couple of nodes to be managers:
   ```
-  docker promote XXX YYY
+  docker node promote XXX YYY
   ```
 
 ]
@@ -1244,6 +1256,8 @@ You can only control the Swarm through a manager node.
 
 ]
 
+Go back to `node1` afterwards.
+
 ---
 
 ## Scale our service
@@ -2328,7 +2342,7 @@ If only we could do a rolling upgrade!
 - Set an alias so that swarmctl can run as root and use the right control socket:
   ```bash
     alias \
-      swarmctl='sudo swarmctl --socket /var/run/docker/cluster/docker-swarmd.sock'
+      swarmctl='sudo swarmctl --socket /var/lib/docker/swarm/control.sock'
   ```
 
 ]
@@ -2485,7 +2499,8 @@ What we will do:
 - Create the Logstash service:
   ```bash
   docker service create --network logging --name logstash \
-         -e LOGSPOUT=ignore logstash -e "$(cat logstash.conf)"
+         -e LOGSPOUT=ignore logstash \
+         -e "$(cat ~/orchestration-workshop/elk/logstash.conf)"
   ```
 
 ]
@@ -2518,7 +2533,7 @@ What we will do:
 
 - Get the ID of the Logstash container:
   ```bash
-  CID=$(docker ps -q --filter label=com.docker.swarm.service=logstash)
+  CID=$(docker ps -q --filter label=com.docker.swarm.service.name=logstash)
   ```
 
 - View the logs:
@@ -2594,34 +2609,6 @@ You should see the heartbeat messages:
 
 ---
 
-## Visualizing container logs in Kibana
-
-<!--
-- Less than 5 seconds later (the refresh rate of the UI),
-  the log line should be visible in the web UI
--->
-
-- We can customize the web UI to be more readable
-
-.exercise[
-
-- In the left column, move the mouse over the following
-  columns, and click the "Add" button that appears:
-
-<!--
-  - host
-  - container_name
-  - message
--->
-
-  - logsource
-  - program
-  - message
-
-]
-
----
-
 ## Setting up Logspout
 
 - Logspout connects to the Docker control socket
@@ -2651,8 +2638,28 @@ You should see the heartbeat messages:
 
 - Container logs should be showing up!
 
+- We can customize the web UI to be more readable
+
+.exercise[
+
+- In the left column, move the mouse over the following
+  columns, and click the "Add" button that appears:
+
+<!--
+  - host
+  - container_name
+  - message
+-->
+
+  - logsource
+  - program
+  - message
+
+]
+
 ---
 
+
 ## Controlling Docker from a container
 
 - In a local environment, just bind-mount the Docker control socket: