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 #332 from hypriot/hypriotos-11.11.5
Browse files Browse the repository at this point in the history
Update Docker 19.03.5
  • Loading branch information
StefanScherer authored Dec 3, 2019
2 parents 35d4010 + 0424dd0 commit 704704c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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.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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 704704c

Please sign in to comment.