Merge pull request #337 from hypriot/update-compose-1.25.1

Update docker-compose 1.25.1
hypriot · Jan 7, 2020 · 1114b95 · 1114b95
2 parents d07c3d1 + cca14aa
commit 1114b95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"