From b4d93280a9253f28952df399022509e2c3fae94d Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 3 Dec 2019 19:37:37 +0100 Subject: [PATCH 1/2] Update Docker 19.03.5 --- .../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 6ebeb68..b1d1692 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.4~3-0~raspbian/ } + its(:stdout) { should match /5:19.03.5~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.4, build/ } + its(:stdout) { should match /Docker version 19.03.5, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - 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(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.5. API version: 1.40/m } + its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.5. API version: 1.40/m } its(:exit_status) { should eq 0 } end diff --git a/versions.config b/versions.config index 323828f..5d0ebd7 100644 --- a/versions.config +++ b/versions.config @@ -13,6 +13,6 @@ export KERNEL_BUILD="1.20190925+1-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.75" export DOCKER_CE_CHANNEL="stable" # stable, test or edge -export DOCKER_CE_VERSION="5:19.03.4~3-0~raspbian-buster" +export DOCKER_CE_VERSION="5:19.03.5~3-0~raspbian-buster" export DOCKER_COMPOSE_VERSION="1.23.2" export DOCKER_MACHINE_VERSION="0.16.2" From 0424dd07b6c79ff8faf64d7e6cb6701ca7940519 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 3 Dec 2019 19:38:19 +0100 Subject: [PATCH 2/2] Update link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85abf9d..e4bf6c7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Join the chat at https://gitter.im/hypriot/talk](https://badges.gitter.im/hypriot/talk.svg)](https://gitter.im/hypriot/talk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://circleci.com/gh/hypriot/image-builder-rpi.svg?style=svg)](https://circleci.com/gh/hypriot/image-builder-rpi) -[![Latest Release](https://img.shields.io/github/downloads/hypriot/image-builder-rpi/v1.11.4/total.svg)](https://github.com/hypriot/image-builder-rpi/releases/tag/v1.11.4) +[![Latest Release](https://img.shields.io/github/downloads/hypriot/image-builder-rpi/v1.11.5/total.svg)](https://github.com/hypriot/image-builder-rpi/releases/tag/v1.11.5) [![All Releases](https://img.shields.io/github/downloads/hypriot/image-builder-rpi/total.svg)](https://github.com/hypriot/image-builder-rpi/releases) This repo builds the SD card image with HypriotOS for the Raspberry Pi 1, 2, 3, 4