Merge pull request #158 from hypriot/update-docker-1.13.1

Update Docker 1.13.1
hypriot · Feb 19, 2017 · 49e2119 · 49e2119
2 parents f2b0087 + d89aeb5
commit 49e2119
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/builder/files/etc/udev/rules.d/99-com.rules b/builder/files/etc/udev/rules.d/99-com.rules
diff --git 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-engine') do
   its(:stdout) { should match /ii  docker-engine/ }
-  its(:stdout) { should match /1.13.0-0~raspbian-jessie/ }
+  its(:stdout) { should match /1.13.1-0~raspbian-jessie/ }
   its(:exit_status) { should eq 0 }
 end
 
@@ -79,13 +79,13 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 1.13.0, build/ }
+  its(:stdout) { should match /Docker version 1.13.1, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client:. Version:      1.13.0. API version:  1.25/m }
-  its(:stdout) { should match /Server:. Version:      1.13.0. API version:  1.25/m }
+  its(:stdout) { should match /Client:. Version:      1.13.1. API version:  1.26/m }
+  its(:stdout) { should match /Server:. Version:      1.13.1. API version:  1.26/m }
   its(:exit_status) { should eq 0 }
 end
 

diff --git a/versions.config b/versions.config
@@ -10,7 +10,7 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1
 # specific versions of kernel/firmware and docker tools
 export KERNEL_BUILD="20170119-202035"
 export KERNEL_VERSION="4.4.43"
-export DOCKER_ENGINE_VERSION="1.13.0-0~raspbian-jessie"
+export DOCKER_ENGINE_VERSION="1.13.1-0~raspbian-jessie"
 export DOCKER_COMPOSE_VERSION="1.9.0-23"
 export DOCKER_MACHINE_VERSION="0.9.0-39"
 export DEVICE_INIT_VERSION="0.1.8"