Skip to content

Commit

Permalink
Merge pull request #38 from DieterReuter/update-docker-ce-17.11-0
Browse files Browse the repository at this point in the history
Update Docker 17.11.0-ce
  • Loading branch information
DieterReuter authored Nov 29, 2017
2 parents bc671b6 + f9f3ec5 commit 197d8a5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
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-ce') do
its(:stdout) { should match /ii docker-ce/ }
its(:stdout) { should match /17.10.0~ce-0~ubuntu/ }
its(:stdout) { should match /17.11.0~ce-0~ubuntu/ }
its(:stdout) { should match /arm64/ }
its(:exit_status) { should eq 0 }
end
Expand Down Expand Up @@ -73,13 +73,13 @@
end

describe command('docker -v') do
its(:stdout) { should match /Docker version 17.10.0-ce, build/ }
its(:stdout) { should match /Docker version 17.11.0-ce, build/ }
its(:exit_status) { should eq 0 }
end

describe command('docker version') do
its(:stdout) { should match /Client:. Version: 17.10.0-ce. API version: 1.33/m }
its(:stdout) { should match /Server:. Version: 17.10.0-ce. API version: 1.33/m }
its(:stdout) { should match /Client:. Version: 17.11.0-ce. API version: 1.34/m }
its(:stdout) { should match /Server:. Version: 17.11.0-ce. API version: 1.34/m }
its(:exit_status) { should eq 0 }
end

Expand Down
2 changes: 1 addition & 1 deletion versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1
export BOOTLOADER_BUILD="20171003-131045"
export KERNEL_BUILD="20171128-062501"
export KERNEL_VERSION="4.9.65"
export DOCKER_ENGINE_VERSION="17.10.0~ce"
export DOCKER_ENGINE_VERSION="17.11.0~ce"
export DOCKER_COMPOSE_VERSION="1.17.1"
export DOCKER_MACHINE_VERSION="0.13.0"

0 comments on commit 197d8a5

Please sign in to comment.