From 83f3ebb1fa6984d5c06e7b63bccb0e8b5f4c6b90 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Mon, 4 Nov 2019 10:34:36 +0100 Subject: [PATCH 1/2] Update Docker 19.03.4 --- .../test-integration/spec/hypriotos-image/docker_spec.rb | 8 ++++---- versions.config | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 157e52c..6ebeb68 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker_spec.rb @@ -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.3~3-0~raspbian/ } + its(:stdout) { should match /5:19.03.4~3-0~raspbian/ } its(:stdout) { should match /armhf/ } its(:exit_status) { should eq 0 } end @@ -87,13 +87,13 @@ end describe command('docker -v') do - its(:stdout) { should match /Docker version 19.03.3, build/ } + its(:stdout) { should match /Docker version 19.03.4, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.3. API version: 1.40/m } - its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.3. API version: 1.40/m } + its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.4. API version: 1.40/m } + its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.4. API version: 1.40/m } its(:exit_status) { should eq 0 } end diff --git a/versions.config b/versions.config index 38a69e1..3bda0fe 100644 --- a/versions.config +++ b/versions.config @@ -13,6 +13,6 @@ export KERNEL_BUILD="1.20190819-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.19.66" export DOCKER_CE_CHANNEL="stable" # stable, test or edge -export DOCKER_CE_VERSION="5:19.03.3~3-0~raspbian-buster" +export DOCKER_CE_VERSION="5:19.03.4~3-0~raspbian-buster" export DOCKER_COMPOSE_VERSION="1.23.2" export DOCKER_MACHINE_VERSION="0.16.2" From 1a22fc2c660c03ec1ff4793553a925b2174e0c33 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Mon, 4 Nov 2019 10:48:33 +0100 Subject: [PATCH 2/2] Update kernel --- .../spec/hypriotos-image/base/kernel_spec.rb | 6 +++--- versions.config | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb index 8000698..88df2c4 100644 --- a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' describe command('uname -r') do - its(:stdout) { should match /4.19.66(-v7)?+/ } + its(:stdout) { should match /4.19.75(-v7)?+/ } its(:exit_status) { should eq 0 } end -describe file('/lib/modules/4.19.66+/kernel') do +describe file('/lib/modules/4.19.75+/kernel') do it { should be_directory } end -describe file('/lib/modules/4.19.66-v7+/kernel') do +describe file('/lib/modules/4.19.75-v7+/kernel') do it { should be_directory } end diff --git a/versions.config b/versions.config index 3bda0fe..323828f 100644 --- a/versions.config +++ b/versions.config @@ -8,10 +8,10 @@ RAW_IMAGE_VERSION="v0.3.2" RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c4a5a" # specific versions of kernel/firmware and docker tools -export KERNEL_BUILD="1.20190819-1" +export KERNEL_BUILD="1.20190925+1-1" # For testing a new kernel, use the CircleCI artifacts URL. # 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.66" +# export KERNEL_VERSION="4.19.75" export DOCKER_CE_CHANNEL="stable" # stable, test or edge export DOCKER_CE_VERSION="5:19.03.4~3-0~raspbian-buster" export DOCKER_COMPOSE_VERSION="1.23.2"