Merge pull request #303 from hypriot/update-docker-19-03-0

Update Docker 19.03.0

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.57(-v7)?+/ }
+  its(:stdout) { should match /4.19.58(-v7)?+/ }
   its(:exit_status) { should eq 0 }
 end
 
-describe file('/lib/modules/4.19.57+/kernel') do
+describe file('/lib/modules/4.19.58+/kernel') do
   it { should be_directory }
 end
 
-describe file('/lib/modules/4.19.57-v7+/kernel') do
+describe file('/lib/modules/4.19.58-v7+/kernel') do
   it { should be_directory }
 end

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 /19.03.0~2.3.rc3-0~raspbian/ }
+  its(:stdout) { should match /5:19.03.0~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.0-rc3, build/ }
+  its(:stdout) { should match /Docker version 19.03.0, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client: Docker Engine - Community. Version:           19.03.0-rc3. API version:       1.40/m }
-  its(:stdout) { should match /Server: Docker Engine - Community. Engine:.  Version:          19.03.0-rc3.  API version:      1.40/m }
+  its(:stdout) { should match /Client: Docker Engine - Community. Version:           19.03.0. API version:       1.40/m }
+  its(:stdout) { should match /Server: Docker Engine - Community. Engine:.  Version:          19.03.0.  API version:      1.40/m }
   its(:exit_status) { should eq 0 }
 end
 

versions.config

@@ -8,11 +8,11 @@ RAW_IMAGE_VERSION="v0.3.1"
 RAW_IMAGE_CHECKSUM="ccff10498fb45fb76c6064988fb01b3543adfdb70ee7e5fb04b51885573684a6"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="1.20190709-1"
+export KERNEL_BUILD="1.20190718-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.57"
-export DOCKER_CE_CHANNEL="test" # stable, test or edge
-export DOCKER_CE_VERSION="5:19.03.0~2.3.rc3-0~raspbian-stretch"
+# export KERNEL_VERSION="4.19.58"
+export DOCKER_CE_CHANNEL="stable" # stable, test or edge
+export DOCKER_CE_VERSION="5:19.03.0~3-0~raspbian-stretch"
 export DOCKER_COMPOSE_VERSION="1.23.2"
 export DOCKER_MACHINE_VERSION="0.16.1"