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 #349 from hypriot/docker-19-03-8
Browse files Browse the repository at this point in the history
Update Docker 19.03.8
  • Loading branch information
StefanScherer authored Mar 12, 2020
2 parents 92fb2ad + 02fe769 commit 85ec315
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 /5:19.03.6~3-0~raspbian/ }
its(:stdout) { should match /5:19.03.8~3-0~raspbian/ }
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.6, build/ }
its(:stdout) { should match /Docker version 19.03.8, build/ }
its(:exit_status) { should eq 0 }
end

describe command('docker version') do
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.6. API version: 1.40/m }
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.6. API version: 1.40/m }
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.8. API version: 1.40/m }
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.8. 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 @@ -12,6 +12,6 @@ RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c
# 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.19.97"
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
export DOCKER_CE_VERSION="5:19.03.6~3-0~raspbian-buster"
export DOCKER_CE_VERSION="5:19.03.8~3-0~raspbian-buster"
export DOCKER_COMPOSE_VERSION="1.25.4"
export DOCKER_MACHINE_VERSION="0.16.2"

0 comments on commit 85ec315

Please sign in to comment.