Update versions

prepare-vms/scripts/aws.sh

@@ -102,8 +102,7 @@ aws_kill_instances_by_tag() {
 
     echo "Deleting instances with tag $TAG"
 
-    echo "$IDS" \
-        | xargs aws ec2 terminate-instances --instance-ids \
+    aws ec2 terminate-instances --instance-ids $IDS \
         | grep ^TERMINATINGINSTANCES
 }
 

prepare-vms/scripts/trainer-cli

@@ -424,7 +424,7 @@ run_cli() {
         echo "$IPS" > tags/$TAG/ips.txt
         link_tag $TAG
         echo "To deploy or kill these instances, run one of the following:"
-        echo "trainer deploy $TAG"
+        echo "trainer deploy $TAG <settings/somefile.yml>"
         echo "trainer list $TAG"
         ;;
     status)

prepare-vms/settings/fundamentals.yaml

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

prepare-vms/settings/orchestration.yaml

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

prepare-vms/settings/rc.yaml

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