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

Commit 2aa6b33

Browse files
Merge pull request #367 from hypriot/update-docker-19-03-12
Update Docker 19.03.12, Compose 1.26.1
2 parents b324846 + c95cc16 commit 2aa6b33

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
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
@@ -14,7 +14,7 @@
1414

1515
describe command('dpkg -l docker-ce') do
1616
its(:stdout) { should match /ii docker-ce/ }
17-
its(:stdout) { should match /5:19.03.11~3-0~raspbian/ }
17+
its(:stdout) { should match /5:19.03.12~3-0~raspbian/ }
1818
its(:stdout) { should match /armhf/ }
1919
its(:exit_status) { should eq 0 }
2020
end
@@ -87,13 +87,13 @@
8787
end
8888

8989
describe command('docker -v') do
90-
its(:stdout) { should match /Docker version 19.03.11, build/ }
90+
its(:stdout) { should match /Docker version 19.03.12, build/ }
9191
its(:exit_status) { should eq 0 }
9292
end
9393

9494
describe command('docker version') do
95-
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.11. API version: 1.40/m }
96-
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.11. API version: 1.40/m }
95+
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.12. API version: 1.40/m }
96+
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.12. API version: 1.40/m }
9797
its(:exit_status) { should eq 0 }
9898
end
9999

versions.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c
1212
# export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
1313
# export KERNEL_VERSION="4.19.97"
1414
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
15-
export DOCKER_CE_VERSION="5:19.03.11~3-0~raspbian-buster"
16-
export DOCKER_COMPOSE_VERSION="1.25.5"
15+
export DOCKER_CE_VERSION="5:19.03.12~3-0~raspbian-buster"
16+
export DOCKER_COMPOSE_VERSION="1.26.1"
1717
export DOCKER_MACHINE_VERSION="0.16.2"

0 commit comments

Comments
 (0)