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 #328 from hypriot/docker-19-03-4
Browse files Browse the repository at this point in the history
Update Docker 19.03.4
  • Loading branch information
StefanScherer committed Nov 4, 2019
2 parents 259b103 + 1a22fc2 commit 7163210
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -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
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.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
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ 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.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"

0 comments on commit 7163210

Please sign in to comment.