Update stateful section

Fix broken link to nomenclature doc

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
 

bin/build-tag-push.py

@@ -16,9 +16,11 @@ if not registry:
 # Get the name of the current directory.
 project_name = os.path.basename(os.path.realpath("."))
 
-# Generate a Docker image tag, using the UNIX timestamp.
-# (i.e. number of seconds since January 1st, 1970)
-version = str(int(time.time()))
+# Version used to tag the generated Docker image, using the UNIX timestamp or the given version.
+if "VERSION" not in os.environ:
+    version = str(int(time.time()))
+else:
+    version = os.environ["VERSION"]
 
 # Execute "docker-compose build" and abort if it fails.
 subprocess.check_call(["docker-compose", "-f", "docker-compose.yml", "build"])
@@ -33,7 +35,7 @@ push_operations = dict()
 for service_name, service in compose_file.services.items():
     if "build" in service:
         compose_image = "{}_{}".format(project_name, service_name)
-        registry_image = "{}/{}_{}:{}".format(registry, project_name, service_name, version)
+        registry_image = "{}/{}:{}".format(registry, compose_image, version)
         # Re-tag the image so that it can be uploaded to the registry.
         subprocess.check_call(["docker", "tag", compose_image, registry_image])
         # Spawn "docker push" to upload the image.

cadvisor/docker-compose.yml

@@ -1,10 +1,12 @@
-cadvisor:
-  image: google/cadvisor
-  ports:
-    - "8080:8080"
-  volumes:
-    - "/:/rootfs:ro"
-    - "/var/run:/var/run:rw"
-    - "/sys:/sys:ro"
-    - "/var/lib/docker/:/var/lib/docker:ro"
+version: "2"
 
+services:
+    cadvisor:
+      image: google/cadvisor
+      ports:
+        - "8080:8080"
+      volumes:
+        - "/:/rootfs:ro"
+        - "/var/run:/var/run:rw"
+        - "/sys:/sys:ro"
+        - "/var/lib/docker/:/var/lib/docker:ro"

dockercoins/docker-compose.yml-ambassador

@@ -1,27 +0,0 @@
-version: "2"
-
-services:
-  rng:
-    build: rng
-    ports:
-    - "8001:80"
-
-  hasher:
-    build: hasher
-    ports:
-    - "8002:80"
-
-  webui:
-    build: webui
-    ports:
-    - "8000:80"
-    volumes:
-    - "./webui/files/:/files/"
-
-  redis:
-    image: jpetazzo/hamba
-    command: 6379 AA.BB.CC.DD:EEEEE
-
-  worker:
-    build: worker
-

dockercoins/docker-compose.yml-images

@@ -1,30 +1,21 @@
 version: "2"
 
 services:
-  rng1:
-    build: rng
-  rng2:
-    build: rng
-  rng3:
-    build: rng
-
   rng:
-    image: jpetazzo/hamba
-    command: 80 rng1:80 rng2:80 rng3:80
-    depends_on:
-    - rng1
-    - rng2
-    - rng3
+    build: rng
+    image: ${REGISTRY_SLASH}rng${COLON_TAG}
     ports:
     - "8001:80"
 
   hasher:
     build: hasher
+    image: ${REGISTRY_SLASH}hasher${COLON_TAG}
     ports:
     - "8002:80"
 
   webui:
     build: webui
+    image: ${REGISTRY_SLASH}webui${COLON_TAG}
     ports:
     - "8000:80"
     volumes:
@@ -35,4 +26,5 @@ services:
 
   worker:
     build: worker
+    image: ${REGISTRY_SLASH}worker${COLON_TAG}
 

dockercoins/docker-compose.yml-portmap

@@ -1,26 +0,0 @@
-version: "2"
-
-services:
-  rng:
-    build: rng
-    ports:
-    - "80"
-
-  hasher:
-    build: hasher
-    ports:
-    - "8002:80"
-
-  webui:
-    build: webui
-    ports:
-    - "8000:80"
-    volumes:
-    - "./webui/files/:/files/"
-
-  redis:
-    image: redis
-
-  worker:
-    build: worker
-

dockercoins/docker-compose.yml-v2

@@ -1,20 +0,0 @@
-version: '2'
-
-services:
-  rng:
-    build: rng
-
-  hasher:
-    build: hasher
-
-  webui:
-    build: webui
-    ports:
-    - "8000:80"
-
-  redis:
-    image: redis
-
-  worker:
-    build: worker
-

dockercoins/ports.yml

@@ -1,5 +0,0 @@
-hasher: 80
-redis: 6379
-rng: 80
-webui: 80
-

dockercoins/webui/files/index.html

@@ -50,7 +50,7 @@ function refresh () {
             points.push({ x: s2.now, y: speed });
         }
         $("#speed").text("~" + speed.toFixed(1) + " hashes/second");
-        var msg = ("I'm attending the @docker workshop at @scaleconf, "
+        var msg = ("I'm attending the @docker workshop at #LinuxCon, "
                    + "and my #DockerCoins mining rig is crunching "
                    + speed.toFixed(1) + " hashes/second! W00T!");
         $("#tweet").attr(

elk/logstash.conf

@@ -0,0 +1,34 @@
+input {
+  # Listens on 514/udp and 514/tcp by default; change that to non-privileged port
+  syslog { port => 51415 }
+  # Default port is 12201/udp
+  gelf { }
+  # This generates one test event per minute.
+  # It is great for debugging, but you might
+  # want to remove it in production.
+  heartbeat { }
+}
+# The following filter is a hack!
+# The "de_dot" filter would be better, but it
+# is not pre-installed with logstash by default.
+filter {
+  ruby {
+    code => "
+      event.to_hash.keys.each { |k| event[ k.gsub('.','_') ] = event.remove(k) if k.include?'.' }
+    "
+  }
+}
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+  }
+  # This will output every message on stdout.
+  # It is great when testing your setup, but in
+  # production, it will probably cause problems;
+  # either by filling up your disks, or worse,
+  # by creating logging loops! BEWARE!
+  stdout {
+    codec => rubydebug
+  }
+}
+

prepare-vms/docker-compose.yml

@@ -1,23 +1,26 @@
-prepare-vms:
-    build: .
-    container_name: prepare-vms
-    working_dir: /root/prepare-vms
-    volumes:
-        - $HOME/.aws/:/root/.aws/
-        - /etc/localtime:/etc/localtime:ro
-        - /tmp/.X11-unix:/tmp/.X11-unix
-        - $SSH_AUTH_DIRNAME:$SSH_AUTH_DIRNAME
-        - $PWD/:/root/prepare-vms/
-    environment:
-        SCRIPT_DIR: /root/prepare-vms
-        DISPLAY: ${DISPLAY}
-        SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
-        SSH_AGENT_PID: ${SSH_AGENT_PID}
-        AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-        AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-        AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
-        AWS_DEFAULT_OUTPUT: json
-        AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
-        AWS_VPC_ID: ${AWS_VPC_ID}
-        USER: ${USER}
-    entrypoint: /root/prepare-vms/scripts/trainer-cli
+version: "2"
+
+services:
+    prepare-vms:
+        build: .
+        container_name: prepare-vms
+        working_dir: /root/prepare-vms
+        volumes:
+            - $HOME/.aws/:/root/.aws/
+            - /etc/localtime:/etc/localtime:ro
+            - /tmp/.X11-unix:/tmp/.X11-unix
+            - $SSH_AUTH_DIRNAME:$SSH_AUTH_DIRNAME
+            - $PWD/:/root/prepare-vms/
+        environment:
+            SCRIPT_DIR: /root/prepare-vms
+            DISPLAY: ${DISPLAY}
+            SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
+            SSH_AGENT_PID: ${SSH_AGENT_PID}
+            AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+            AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+            AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
+            AWS_DEFAULT_OUTPUT: json
+            AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
+            AWS_VPC_ID: ${AWS_VPC_ID}
+            USER: ${USER}
+        entrypoint: /root/prepare-vms/scripts/trainer-cli

prepare-vms/scripts/rc

@@ -11,8 +11,9 @@ pssh () {
     }
 
     echo "[parallel-ssh] $@"
+    export PSSH=$(which pssh || which parallel-ssh)
 
-    parallel-ssh -h $HOSTFILE -l ubuntu \
+    $PSSH -h $HOSTFILE -l ubuntu \
     --par 100 \
     -O LogLevel=ERROR \
     -O UserKnownHostsFile=/dev/null \

prepare-vms/settings/fundamentals.yaml

@@ -10,9 +10,7 @@ instance_password: training
 clustersize: 1  # Number of VMs per cluster
 pagesize: 15    # Number of cards to print per page
 
-#background_image: https://myapps.developer.ubuntu.com/site_media/appmedia/2014/12/swarm.png
-background_image: http://www.yellosoft.us/public/images/docker.png
-#background_image: ../media/swarm.png
+background_image: https://www.docker.com/sites/default/files/Engine.png
 
 # To be printed on the cards:
 blurb: >

prepare-vms/settings/orchestration.yaml

@@ -10,8 +10,7 @@ instance_password: training
 clustersize: 5  # Number of VMs per cluster
 pagesize: 12    # Number of cards to print per page
 
-#background_image: https://myapps.developer.ubuntu.com/site_media/appmedia/2014/12/swarm.png
-background_image: http://www.yellosoft.us/public/images/docker.png
+background_image: https://www.docker.com/sites/default/files/Engine.png
 #background_image: ../media/swarm.png
 
 # To be printed on the cards:
@@ -30,6 +29,6 @@ footer: >
 url: http://container.training/
 
 engine_version: get.docker.com
-compose_version: 1.7.1
-machine_version: 0.6.0
-swarm_version: 1.2.2
+compose_version: 1.8.0
+machine_version: 0.8.0
+swarm_version: 1.2.4

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

www/docker-compose.yml

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