From 3ec61d706e7884da52ea9e0879ba453d0cbe11ee Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Wed, 20 Apr 2016 08:07:50 -0700
Subject: [PATCH] Update versions

---
 prepare-vms/scripts/aws.sh              | 3 +--
 prepare-vms/scripts/trainer-cli         | 2 +-
 prepare-vms/settings/fundamentals.yaml  | 4 ++--
 prepare-vms/settings/orchestration.yaml | 4 ++--
 prepare-vms/settings/rc.yaml            | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/prepare-vms/scripts/aws.sh b/prepare-vms/scripts/aws.sh
index b644986f..8763dc4c 100755
--- a/prepare-vms/scripts/aws.sh
+++ b/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
 }
 
diff --git a/prepare-vms/scripts/trainer-cli b/prepare-vms/scripts/trainer-cli
index 24985f90..7028db81 100755
--- a/prepare-vms/scripts/trainer-cli
+++ b/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)
diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/fundamentals.yaml
index dea76d4e..5845f34d 100644
--- a/prepare-vms/settings/fundamentals.yaml
+++ b/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
diff --git a/prepare-vms/settings/orchestration.yaml b/prepare-vms/settings/orchestration.yaml
index 9b99fd79..14012588 100644
--- a/prepare-vms/settings/orchestration.yaml
+++ b/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
diff --git a/prepare-vms/settings/rc.yaml b/prepare-vms/settings/rc.yaml
index 251fee67..24436500 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-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