Skip to content

Commit 9336fe8

Browse files
authored
Merge pull request #39 from DieterReuter/downgrade-docker-ce-17.10-0
Revert "Update Docker 17.11.0-ce"
2 parents 197d8a5 + 388f813 commit 9336fe8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

builder/test-integration/spec/hypriotos-image/docker_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
describe command('dpkg -l docker-ce') do
88
its(:stdout) { should match /ii docker-ce/ }
9-
its(:stdout) { should match /17.11.0~ce-0~ubuntu/ }
9+
its(:stdout) { should match /17.10.0~ce-0~ubuntu/ }
1010
its(:stdout) { should match /arm64/ }
1111
its(:exit_status) { should eq 0 }
1212
end
@@ -73,13 +73,13 @@
7373
end
7474

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

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

versions.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1
1111
export BOOTLOADER_BUILD="20171003-131045"
1212
export KERNEL_BUILD="20171128-062501"
1313
export KERNEL_VERSION="4.9.65"
14-
export DOCKER_ENGINE_VERSION="17.11.0~ce"
14+
export DOCKER_ENGINE_VERSION="17.10.0~ce"
1515
export DOCKER_COMPOSE_VERSION="1.17.1"
1616
export DOCKER_MACHINE_VERSION="0.13.0"

0 commit comments

Comments
 (0)