Merge pull request #323 from hypriot/docker-19-03-3

Update Docker 19.03.3

Author: StefanScherer

builder/chroot-script.sh

@@ -103,10 +103,6 @@ echo "deb [arch=armhf] https://download.docker.com/linux/raspbian buster $DOCKER
 
 c_rehash
 
-# set up hypriot rpi repository for raspbian specific packages
-echo 'deb https://packagecloud.io/Hypriot/rpi/raspbian/ buster main' >> /etc/apt/sources.list.d/hypriot.list
-curl -L https://packagecloud.io/Hypriot/rpi/gpgkey | apt-key add -
-
 RPI_ORG_FPR=CF8A1AF502A2AA2D763BAE7E82B129927FA3303E RPI_ORG_KEY_URL=http://archive.raspberrypi.org/debian/raspberrypi.gpg.key
 get_gpg "${RPI_ORG_FPR}" "${RPI_ORG_KEY_URL}"
 

builder/files/etc/apt/preferences.d/hypriot

@@ -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.2~3-0~raspbian/ }
+  its(:stdout) { should match /5:19.03.3~3-0~raspbian/ }
   its(:stdout) { should match /armhf/ }
   its(:exit_status) { should eq 0 }
 end
@@ -42,7 +42,7 @@
   it { should be_owned_by 'root' }
 end
 
-describe file('/usr/sbin/runc') do
+describe file('/usr/bin/runc') do
   it { should be_file }
   it { should be_mode 755 }
   it { should be_owned_by 'root' }
@@ -87,13 +87,13 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 19.03.2, build/ }
+  its(:stdout) { should match /Docker version 19.03.3, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client: Docker Engine - Community. Version:           19.03.2. API version:       1.40/m }
-  its(:stdout) { should match /Server: Docker Engine - Community. Engine:.  Version:          19.03.2.  API version:      1.40/m }
+  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(:exit_status) { should eq 0 }
 end
 

builder/test-integration/spec/hypriotos-image/docker_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe file('/etc/apt/sources.list.d/hypriot.list') do
-  it { should be_file }
-  it { should be_mode 644 }
-  it { should be_owned_by 'root' }
-  it { should contain 'deb https://packagecloud.io/Hypriot/rpi/raspbian/ buster main' }
+  it { should_not be_file }
 end
 
 describe package('apt-transport-https') do

builder/test-integration/spec/hypriotos-image/hypriot-list_spec.rb

@@ -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.2~3-0~raspbian-buster"
+export DOCKER_CE_VERSION="5:19.03.3~3-0~raspbian-buster"
 export DOCKER_COMPOSE_VERSION="1.23.2"
 export DOCKER_MACHINE_VERSION="0.16.2"