From cca14aab0e6bb7b996a38936a26c0422aea055b1 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 7 Jan 2020 11:02:13 +0100 Subject: [PATCH] Update docker-compose 1.25.1 --- README.md | 2 +- .../spec/hypriotos-image/docker-compose_spec.rb | 2 +- versions.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e4bf6c7..ce33f68 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.5/total.svg)](https://github.com/hypriot/image-builder-rpi/releases/tag/v1.11.5) +[![Latest Release](https://img.shields.io/github/downloads/hypriot/image-builder-rpi/v1.12.0/total.svg)](https://github.com/hypriot/image-builder-rpi/releases/tag/v1.12.0) [![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 diff --git a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb index 4d7c8b9..02369db 100644 --- a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb @@ -7,7 +7,7 @@ end describe command('docker-compose --version') do - its(:stdout) { should match /1.25.0/m } + its(:stdout) { should match /1.25.1/m } its(:exit_status) { should eq 0 } end diff --git a/versions.config b/versions.config index 4f91c25..6cc746f 100644 --- a/versions.config +++ b/versions.config @@ -14,5 +14,5 @@ export KERNEL_BUILD="1.20190925+1-1" # export KERNEL_VERSION="4.19.75" export DOCKER_CE_CHANNEL="stable" # stable, test or edge export DOCKER_CE_VERSION="5:19.03.5~3-0~raspbian-buster" -export DOCKER_COMPOSE_VERSION="1.25.0" +export DOCKER_COMPOSE_VERSION="1.25.1" export DOCKER_MACHINE_VERSION="0.16.2"