Skip to content
This repository has been archived by the owner on Aug 14, 2023. It is now read-only.

Commit

Permalink
Upgrade to Docker engine v1.10.1-1
Browse files Browse the repository at this point in the history
  • Loading branch information
DieterReuter committed Feb 12, 2016
1 parent 3bc7a9f commit 26aca02
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion builder/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions builder/test-integration/spec/hypriotos-image/docker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 26aca02

Please sign in to comment.