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

Commit

Permalink
Merge pull request #286 from hypriot/update-19.03.0-beta2
Browse files Browse the repository at this point in the history
Update Docker 19.03.0-beta2
  • Loading branch information
StefanScherer authored Apr 19, 2019
2 parents 8725f61 + ad4186c commit 54e7218
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 @@ -14,7 +14,7 @@

describe command('dpkg -l docker-ce') do
its(:stdout) { should match /ii docker-ce/ }
its(:stdout) { should match /19.03.0~1.1.beta1-0~raspbian-stretch/ }
its(:stdout) { should match /19.03.0~1.2.beta2-0~raspbian-stretch/ }
its(:stdout) { should match /armhf/ }
its(:exit_status) { should eq 0 }
end
Expand Down Expand Up @@ -87,13 +87,13 @@
end

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

describe command('docker version') do
its(:stdout) { should match /Client:. Version: 19.03.0-beta1. API version: 1.40/m }
its(:stdout) { should match /Server:. Engine:. Version: 19.03.0-beta1. API version: 1.40/m }
its(:stdout) { should match /Client:. Version: 19.03.0-beta2. API version: 1.40/m }
its(:stdout) { should match /Server:. Engine:. Version: 19.03.0-beta2. API version: 1.40/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 @@ -13,6 +13,6 @@ export KERNEL_BUILD="1.20190401-1"
# export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
export KERNEL_VERSION="4.14.98"
export DOCKER_CE_CHANNEL="test" # stable, test or edge
export DOCKER_CE_VERSION="5:19.03.0~1.1.beta1-0~raspbian-stretch"
export DOCKER_CE_VERSION="5:19.03.0~1.2.beta2-0~raspbian-stretch"
export DOCKER_COMPOSE_VERSION="1.23.2"
export DOCKER_MACHINE_VERSION="0.16.1"

0 comments on commit 54e7218

Please sign in to comment.