Add slides about rockstars

Switch to in-person mode
Change chat links
2026-04-17 07:36:51 +00:00 · 2017-03-21 19:07:04 -07:00 · 2017-03-21 09:54:05 -07:00 · 2017-03-21 09:53:08 -07:00
20 changed files with 755 additions and 1450 deletions
--- a/dockercoins/docker-compose.yml-images
+++ b/dockercoins/docker-compose.yml-images
--- a/dockercoins/docker-compose.yml-logging
+++ b/dockercoins/docker-compose.yml-logging
--- a/docs/chat/index.html
+++ b/docs/chat/index.html
@@ -1,9 +1,9 @@
 <html>
 <!-- Generated with index.html.sh -->
 <head>
-<meta http-equiv="refresh" content="0; URL='https://dockercommunity.slack.com/messages/docker-mentor'" />
+<meta http-equiv="refresh" content="0; URL='https://gitter.im/jpetazzo/workshop-20170322-sanjose'" />
 </head>
 <body>
-<a href="https://dockercommunity.slack.com/messages/docker-mentor">https://dockercommunity.slack.com/messages/docker-mentor</a>
+<a href="https://gitter.im/jpetazzo/workshop-20170322-sanjose">https://gitter.im/jpetazzo/workshop-20170322-sanjose</a>
 </body>
 </html>
--- a/docs/chat/index.html.sh
+++ b/docs/chat/index.html.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-#LINK=https://gitter.im/jpetazzo/workshop-20170322-sanjose
-LINK=https://dockercommunity.slack.com/messages/docker-mentor
+LINK=https://gitter.im/jpetazzo/workshop-20170322-sanjose
+#LINK=https://dockercommunity.slack.com/messages/captains
 #LINK=https://usenix-lisa.slack.com/messages/docker
 sed "s,@@LINK@@,$LINK,g" >index.html <<EOF
 <html>
--- a/docs/extra-details.png
+++ b/docs/extra-details.png
--- a/docs/hardwork.png
+++ b/docs/hardwork.png
--- a/docs/index.html
+++ b/docs/index.html
--- a/docs/mario-red-shell.png
+++ b/docs/mario-red-shell.png
--- a/docs/pwd-icons.png
+++ b/docs/pwd-icons.png
--- a/docs/rockstars.jpg
+++ b/docs/rockstars.jpg
--- a/prepare-vms/scripts/aws.sh
+++ b/prepare-vms/scripts/aws.sh
@@ -4,12 +4,22 @@ source scripts/cli.sh

 aws_display_tags(){
    # Print all "Name" tags in our region with their instance count
-    echo "[#] [Status] [Token] [Tag]" \
-        | awk '{ printf " %7s %-12s %-25s %-25s\n", $1, $2, $3, $4}'
-    aws ec2 describe-instances \
-            --query "Reservations[*].Instances[*].[State.Name,ClientToken,Tags[0].Value]" \
-        | tr -d "\r" \
-        | awk '{ printf " %-12s %-25s %-25s\n", $1, $2, $3}' \
+    echo "[#] [Status] [Tag]" | awk '{ printf " %7s %8s %10s \n", $1, $2, $3}'
+    aws ec2 describe-instances --filter "Name=tag:Name,Values=[*]" \
+            --query "Reservations[*].Instances[*].[{Tags:Tags[0].Value,State:State.Name}]" \
+        | awk '{ printf " %-13s %-10s %-1s\n", $1, $2, $3}' \
+        | uniq -c \
+        | sort -k 3
+}
+
+aws_display_tokens(){
+    # Print all tokens in our region with their instance count
+    echo "[#] [Token] [Tag]" | awk '{ printf " %7s %12s %30s\n", $1, $2, $3}'
+                            # --query 'Volumes[*].{ID:VolumeId,AZ:AvailabilityZone,Size:Size}'
+    aws ec2 describe-instances --output text \
+            --query 'Reservations[*].Instances[*].{ClientToken:ClientToken,Tags:Tags[0].Value}' \
+        | awk '{ printf " %7s %12s %50s\n", $1, $2, $3}' \
+        | sort \
        | uniq -c \
        | sort -k 3
 }
@@ -56,24 +66,20 @@ aws_display_instances_by_tag() {
        fi
 }

-aws_get_instance_ids_by_filter() {
-    FILTER=$1
-    aws ec2 describe-instances --filters $FILTER \
-        --query Reservations[*].Instances[*].InstanceId \
-        --output text | tr "\t" "\n" | tr -d "\r"
-}
-
-
 aws_get_instance_ids_by_client_token() {
    TOKEN=$1
    need_tag $TOKEN
-    aws_get_instance_ids_by_filter Name=client-token,Values=$TOKEN
+    aws ec2 describe-instances --filters "Name=client-token,Values=$TOKEN" \
+        | grep ^INSTANCE \
+        | awk '{print $8}'
 }

 aws_get_instance_ids_by_tag() {
    TAG=$1
    need_tag $TAG
-    aws_get_instance_ids_by_filter Name=tag:Name,Values=$TAG
+    aws ec2 describe-instances --filters "Name=tag:Name,Values=$TAG" \
+        | grep ^INSTANCE \
+        | awk '{print $8}'
 }

 aws_get_instance_ips_by_tag() {
--- a/prepare-vms/scripts/cli.sh
+++ b/prepare-vms/scripts/cli.sh
@@ -10,12 +10,21 @@ die () {
 need_tag(){
    TAG=$1
    if [ -z "$TAG" ]; then
-        echo "Please specify a tag or token. Here's the list: "
+        echo "Please specify a tag. Here's the list: "
        aws_display_tags
        die
    fi
 }

+need_token(){
+    TOKEN=$1
+    if [ -z "$TOKEN" ]; then
+        echo "Please specify a token. Here's the list: "
+        aws_display_tokens
+        die
+    fi
+}
+
 need_ips_file() {
    IPS_FILE=$1
    if [ -z "$IPS_FILE" ]; then
--- a/prepare-vms/scripts/find-ubuntu-ami.sh
+++ b/prepare-vms/scripts/find-ubuntu-ami.sh
@@ -3,7 +3,7 @@

 usage() {
    cat >&2 <<__
-usage: find-ubuntu-ami.sh [ <filter>... ] [ <sorting> ] [ <options> ]
+usage: find-ubuntu-ami.sh [ <filter>... ] [ <sorting> ]
 where:
    <filter> is pair of key and substring to search
        -r <region>
@@ -14,7 +14,7 @@ where:
        -d <date>
        -i <image>
        -k <kernel>
-    <sorting> is one of:
+    <sorting> is on of:
        -R   by region 
        -N   by name 
        -V   by version 
@@ -23,8 +23,6 @@ where:
        -D   by date 
        -I   by image 
        -K   by kernel 
-    <options> can be:
-        -q   just show AMI

    protip for Docker orchestration workshop admin:
        ./find-ubuntu-ami.sh -t hvm:ebs -r \$AWS_REGION -v 15.10 -N
@@ -32,7 +30,7 @@ __
    exit 1
 }

-args=`getopt hr:n:v:a:t:d:i:k:RNVATDIKq $*`
+args=`getopt hr:n:v:a:t:d:i:k:RNVATDIK $*`
 if [ $? != 0 ] ; then
    echo >&2
    usage
@@ -49,8 +47,6 @@ kernel=

 sort=date

-quiet=
-
 set -- $args
 for a ; do
    case "$a" in
@@ -73,8 +69,6 @@ for a ; do
        -D) sort=date ;;
        -I) sort=image ;;
        -K) sort=kernel ;;
-
-        -q) quiet=y ;;
        
        --) shift ; break ;;
        *) continue ;;
@@ -125,17 +119,13 @@ escape_spaces() {
 url=http://cloud-images.ubuntu.com/locator/ec2/releasesTable

 {
-    [ "$quiet" ] || echo REGION NAME VERSION ARCH TYPE DATE IMAGE KERNEL
+    echo REGION NAME VERSION ARCH TYPE DATE IMAGE KERNEL
    curl -s $url | fix_json | jq "`jq_query`" | trim_quotes | escape_spaces | tr \| ' '
 } |
    while read region name version arch type date image kernel ; do
        image=${image%<*}
        image=${image#*>}
-        if [ "$quiet" ]; then
-            echo $image
-        else
-            echo "$region|$name|$version|$arch|$type|$date|$image|$kernel"
-        fi
+        echo "$region|$name|$version|$arch|$type|$date|$image|$kernel"
    done | column -t -s \|


--- a/prepare-vms/scripts/postprep.rc
+++ b/prepare-vms/scripts/postprep.rc
@@ -123,12 +123,7 @@ system("echo 1000000 | sudo tee /proc/sys/net/nf_conntrack_max")
 #######################

 # This will install the latest Docker.
-#system("curl --silent https://{}/ | grep -v '( set -x; sleep 20 )' | sudo sh".format(ENGINE_VERSION))
-system("sudo apt-get -qy install apt-transport-https ca-certificates curl software-properties-common")
-system("curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -")
-system("sudo add-apt-repository 'deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial {}'".format(ENGINE_VERSION))
-system("sudo apt-get -q update")
-system("sudo apt-get -qy install docker-ce")
+system("curl --silent https://{}/ | grep -v '( set -x; sleep 20 )' | sudo sh".format(ENGINE_VERSION))

 ### Install docker-compose
 #system("sudo pip install -U docker-compose=={}".format(COMPOSE_VERSION))
@@ -147,8 +142,8 @@ system("sudo apt-get -qy install python-setuptools pssh apache2-utils httping ht
 system("while ! sudo -u docker docker version ; do sleep 2; done")

 ### Install Swarm
-#system("docker pull swarm:{}".format(SWARM_VERSION))
-#system("docker tag -f swarm:{} swarm".format(SWARM_VERSION))
+system("docker pull swarm:{}".format(SWARM_VERSION))
+system("docker tag -f swarm:{} swarm".format(SWARM_VERSION))

 ### BEGIN CLUSTERING ###

@@ -202,5 +197,5 @@ pssh "grep docker@ /home/docker/.ssh/authorized_keys \
        | sudo -u docker tee -a /home/docker/.ssh/authorized_keys"

 # On node1, create and deploy TLS certs using Docker Machine
-#pssh "if grep -q node1 /tmp/node; then grep ' node' /etc/hosts | xargs -n2 sudo -H -u docker docker-machine create -d generic --generic-ssh-user docker --generic-ip-address; fi"
+pssh "if grep -q node1 /tmp/node; then grep ' node' /etc/hosts | xargs -n2 sudo -H -u docker docker-machine create -d generic --generic-ssh-user docker --generic-ip-address; fi"

--- a/prepare-vms/scripts/trainer-cli
+++ b/prepare-vms/scripts/trainer-cli
@@ -192,7 +192,7 @@ sync_keys() {
 }

 suggest_amis() {
-    scripts/find-ubuntu-ami.sh -r $AWS_DEFAULT_REGION -a amd64 -v 16.04 -t hvm:ebs -N -q
+    scripts/find-ubuntu-ami.sh -r $AWS_DEFAULT_REGION -a amd64 -v 16.04 -t hvm:ebs -N
 }

 get_token() {
@@ -203,7 +203,30 @@ get_token() {
 }

 get_ami() {
-    suggest_amis | head -1
+    # using find-ubuntu-ami script in `trainer-tools/scripts`:
+    #AMI=$(./scripts/find-ubuntu-ami.sh -r $AWS_DEFAULT_REGION -a amd64 -v 15.10 -t hvm:ebs -N | grep -v ^REGION | head -1 | awk '{print $7}')
+    #AMI=$(suggest_amis | grep -v ^REGION | head -1 | awk '{print $7}')
+    case $AWS_DEFAULT_REGION in
+    eu-central-1)
+      AMI=ami-82cf0aed
+      ;;
+    eu-west-1)
+      AMI=ami-07174474
+      ;;
+    us-east-1)
+      AMI=ami-2808313f
+      ;;
+    us-east-2)
+      AMI=ami-1b772d7e
+      ;;
+    us-west-1)
+      AMI=ami-dab5e0ba
+      ;;
+    us-west-2)
+      AMI=ami-9ee24ffe
+      ;;
+    esac
+    echo $AMI
 }


--- a/prepare-vms/settings/orchestration.yaml
+++ b/prepare-vms/settings/orchestration.yaml
@@ -10,7 +10,8 @@ instance_password: training
 clustersize: 5  # Number of VMs per cluster
 pagesize: 12    # Number of cards to print per page

-background_image: https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png
+background_image: https://www.docker.com/sites/default/files/Engine.png
+#background_image: ../media/swarm.png

 # To be printed on the cards:
 blurb: >
@@ -27,7 +28,7 @@ footer: >

 url: http://container.training/

-engine_version: test
-compose_version: 1.12.0
-machine_version: 0.12.0
+engine_version: get.docker.com
+compose_version: 1.8.1
+machine_version: 0.8.2
 swarm_version: latest
--- a/prepare-vms/settings/rc.yaml
+++ b/prepare-vms/settings/rc.yaml
@@ -0,0 +1,35 @@
+# This file is passed by trainer-cli to scripts/ips-txt-to-html.py
+
+workshop_name: Advanced Docker Orchestration
+workshop_short_name: orchestration
+repo: https://github.com/jpetazzo/orchestration-workshop
+
+instance_login: docker
+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: ../media/swarm.png
+
+# To be printed on the cards:
+blurb: >
+    Here is the connection information to your very own 
+       {cluster_or_machine} for this {workshop_name} workshop. You can connect 
+       to {this_or_each} VM with any SSH client.
+
+       Your {machine_is_or_machines_are}:
+
+# {url} will be replaced by the script
+footer: >
+    <p>For slides, chat and other useful links, see: </p>
+    <center>{url}</center>
+
+url: http://container.training/
+
+engine_version: test.docker.com
+compose_version: 1.9.0
+machine_version: 0.9.0-rc1
+swarm_version: latest
--- a/prepare-vms/settings/sec.yml
+++ b/prepare-vms/settings/sec.yml
@@ -1,32 +0,0 @@
-# This file is passed by trainer-cli to scripts/ips-txt-to-html.py
-
-workshop_name: Advanced Docker Orchestration
-workshop_short_name: orchestration
-repo: https://github.com/jpetazzo/orchestration-workshop
-
-instance_login: docker
-instance_password: training
-
-clustersize: 3  # Number of VMs per cluster
-pagesize: 12    # Number of cards to print per page
-
-background_image: https://blog.docker.com/media/2015/08/notary.png
-
-# To be printed on the cards:
-blurb: >
-    Here is the connection information to your
-    three Docker nodes for the Security
-    Workshop. You can connect to each VM with
-    any SSH client.
-       
-    Your {machine_is_or_machines_are}:
-
-# {url} will be replaced by the script
-footer: ""
-
-url: http://container.training/
-
-engine_version: get.docker.com
-compose_version: 1.12.0
-machine_version: 0.10.0
-swarm_version: latest
--- a/stacks/dockercoins+gelf.yml
+++ b/stacks/dockercoins+gelf.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
  rng:
    build: dockercoins/rng
-    image: ${REGISTRY-127.0.0.1:5000}/rng:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}rng${COLON_TAG-:latest}
    logging:
      driver: gelf
      options:
@@ -13,7 +13,7 @@ services:

  hasher:
    build: dockercoins/hasher
-    image: ${REGISTRY-127.0.0.1:5000}/hasher:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}hasher${COLON_TAG-:latest}
    logging:
      driver: gelf
      options:
@@ -21,7 +21,7 @@ services:

  webui:
    build: dockercoins/webui
-    image: ${REGISTRY-127.0.0.1:5000}/webui:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}webui${COLON_TAG-:latest}
    logging:
      driver: gelf
      options:
@@ -38,7 +38,7 @@ services:

  worker:
    build: dockercoins/worker
-    image: ${REGISTRY-127.0.0.1:5000}/worker:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}worker${COLON_TAG-:latest}
    logging:
      driver: gelf
      options:
--- a/stacks/dockercoins.yml
+++ b/stacks/dockercoins.yml
@@ -3,17 +3,17 @@ version: "3"
 services:
  rng:
    build: dockercoins/rng
-    image: ${REGISTRY-127.0.0.1:5000}/rng:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}rng${COLON_TAG-:latest}
    deploy:
      mode: global

  hasher:
    build: dockercoins/hasher
-    image: ${REGISTRY-127.0.0.1:5000}/hasher:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}hasher${COLON_TAG-:latest}

  webui:
    build: dockercoins/webui
-    image: ${REGISTRY-127.0.0.1:5000}/webui:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}webui${COLON_TAG-:latest}
    ports:
    - "8000:80"

@@ -22,7 +22,7 @@ services:

  worker:
    build: dockercoins/worker
-    image: ${REGISTRY-127.0.0.1:5000}/worker:${TAG-latest}
+    image: ${REGISTRY_SLASH-127.0.0.1:5000/}worker${COLON_TAG-:latest}
    deploy:
      replicas: 10
Author	SHA1	Message	Date
Jerome Petazzoni	cad9eec6ed	Add slides about rockstars	2017-03-21 19:07:04 -07:00
Jerome Petazzoni	f08ccb17d9	Switch to in-person mode	2017-03-21 09:54:05 -07:00
Jerome Petazzoni	1625d4ab79	Change chat links	2017-03-21 09:53:08 -07:00