Merge branch 'master' of github.com:jpetazzo/orchestration-workshop

prepare-vms/scripts/cli.sh

@@ -1,10 +1,9 @@
 die () {
-    if [ -z "$1" ]; then
-        exit 1
+    if [ -n "$1" ]; then
+        >&2 echo -n $(tput setaf 1)
+        >&2 echo -e "$1"
+        >&2 echo -n $(tput sgr0)
     fi
-    echo -n $(tput setaf 1)
-    echo -e "$1"
-    echo -n $(tput sgr0)
     exit 1
 }
 

prepare-vms/scripts/postprep.rc

@@ -95,11 +95,13 @@ system("curl --silent localhost:55555 || sudo systemctl restart docker ")  # doe
 system("sudo systemctl start docker || true")
 
 ### Install docker-compose
-system("sudo pip install -U docker-compose=={}".format(COMPOSE_VERSION))
+#system("sudo pip install -U docker-compose=={}".format(COMPOSE_VERSION))
+system("sudo curl -sSL -o /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/{}/docker-compose-{}-{}".format(COMPOSE_VERSION, platform.system(), platform.machine()))
+system("sudo chmod +x /usr/local/bin/docker-compose")
 
 ### Install docker-machine
 system("sudo curl -sSL -o /usr/local/bin/docker-machine https://github.com/docker/machine/releases/download/v{}/docker-machine-{}-{}".format(MACHINE_VERSION, platform.system(), platform.machine()))
-system("sudo chmod +x /usr/local/bin/docker-machine*")
+system("sudo chmod +x /usr/local/bin/docker-machine")
 
 system("sudo apt-get remove -y --purge dnsmasq-base")
 system("sudo apt-get -qy install python-setuptools pssh apache2-utils httping htop unzip mosh")

prepare-vms/scripts/trainer-cli

@@ -331,7 +331,7 @@ run_cli() {
         tag_is_reachable $TAG
         echo "You may be interested in running one of the following commands:"
         echo "trainer ips $TAG"
-        echo "trainer deploy $TAG"
+        echo "trainer deploy $TAG <settings/somefile.yaml>"
         ;;
     opensg)
         aws ec2 authorize-security-group-ingress \

prepare-vms/settings/rc.yaml

@@ -30,6 +30,6 @@ footer: >
 url: http://container.training/
 
 engine_version: test.docker.com
-compose_version: 1.7.0rc1
+compose_version: 1.7.0-rc1
 machine_version: 0.7.0-rc1
 swarm_version: 1.2.0-rc1