From 90695596dccf50ad3fa59c589b1e08064eec861f Mon Sep 17 00:00:00 2001
From: Dieter Reuter <dieter.reuter@me.com>
Date: Fri, 12 Feb 2016 12:34:51 +0100
Subject: [PATCH] Update docker 1.10.0, docker-compose 1.6.0

---
 builder/build.sh                                       |  4 ++--
 .../spec/hypriotos-docker/docker-swarm_spec.rb         |  2 +-
 .../spec/hypriotos-image/docker-compose_spec.rb        |  4 ++--
 .../spec/hypriotos-image/docker_spec.rb                | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index a5873bb..09ff7f5 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -28,8 +28,8 @@ QEMU_ARCH="arm"
 export HYPRIOT_IMAGE_VERSION
 
 # specific versions of kernel/firmware and docker tools
-export DOCKER_ENGINE_VERSION="1.9.1-1"
-export DOCKER_COMPOSE_VERSION="1.5.2-80"
+export DOCKER_ENGINE_VERSION="1.10.0-1"
+export DOCKER_COMPOSE_VERSION="1.6.0-27"
 export DOCKER_MACHINE_VERSION="0.4.1-72"
 
 # create build directory for assembling our image filesystem
diff --git a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
index 8d7701c..029fc7d 100644
--- a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
+++ b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb
@@ -10,6 +10,6 @@
 end
 
 describe command('docker images hypriot/rpi-swarm') do
-  its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*483554c63182 / }
+  its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*5eab982fa301 / }
   its(:exit_status) { should eq 0 }
 end
diff --git a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
index 5a4b648..abcf38d 100644
--- a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
@@ -6,7 +6,7 @@
 
 describe command('dpkg -l docker-compose') do
   its(:stdout) { should match /ii  docker-compose/ }
-  its(:stdout) { should match /1.5.2-80/ }
+  its(:stdout) { should match /1.6.0-27/ }
   its(:exit_status) { should eq 0 }
 end
 
@@ -17,6 +17,6 @@
 end
 
 describe command('docker-compose --version') do
-  its(:stdout) { should match /1.5.2/m }
+  its(:stdout) { should match /1.6.0/m }
   its(:exit_status) { should eq 0 }
 end
diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb
index 9480c43..3e5345d 100644
--- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/docker_spec.rb
@@ -6,7 +6,7 @@
 
 describe command('dpkg -l docker-hypriot') do
   its(:stdout) { should match /ii  docker-hypriot/ }
-  its(:stdout) { should match /1.9.1-1/ }
+  its(:stdout) { should match /1.10.0-1/ }
   its(:exit_status) { should eq 0 }
 end
 
@@ -35,7 +35,7 @@
 
 describe file('/var/lib/docker') do
   it { should be_directory }
-  it { should be_mode 700 }
+  it { should be_mode 701 }
   it { should be_owned_by 'root' }
 end
 
@@ -47,13 +47,13 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 1.9.1, build/ }
+  its(:stdout) { should match /Docker version 1.10.0, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client:. Version:      1.9.1. API version:  1.21/m }
-  its(:stdout) { should match /Server:. Version:      1.9.1. API version:  1.21/m }
+  its(:stdout) { should match /Client:. Version:      1.10.0. API version:  1.22/m }
+  its(:stdout) { should match /Server:. Version:      1.10.0. API version:  1.22/m }
   its(:exit_status) { should eq 0 }
 end