From 26aca028a84f8ddaa97b66394c802e4bd0d06443 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Fri, 12 Feb 2016 19:50:58 +0100 Subject: [PATCH] Upgrade to Docker engine v1.10.1-1 --- builder/build.sh | 2 +- .../test-integration/spec/hypriotos-image/docker_spec.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/build.sh b/builder/build.sh index 13cea8d..3163f43 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -28,7 +28,7 @@ QEMU_ARCH="arm" export HYPRIOT_IMAGE_VERSION # specific versions of kernel/firmware and docker tools -export DOCKER_ENGINE_VERSION="1.10.0-1" +export DOCKER_ENGINE_VERSION="1.10.1-1" export DOCKER_COMPOSE_VERSION="1.6.0-27" export DOCKER_MACHINE_VERSION="0.4.1-72" diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 3e5345d..4fe6d12 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.10.0-1/ } + its(:stdout) { should match /1.10.1-1/ } its(:exit_status) { should eq 0 } end @@ -47,13 +47,13 @@ end describe command('docker -v') do - its(:stdout) { should match /Docker version 1.10.0, build/ } + its(:stdout) { should match /Docker version 1.10.1, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - 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(:stdout) { should match /Client:. Version: 1.10.1. API version: 1.22/m } + its(:stdout) { should match /Server:. Version: 1.10.1. API version: 1.22/m } its(:exit_status) { should eq 0 } end