Merge pull request #357 from hypriot/compose-1.25.5

Update docker-compose 1.25.5
hypriot · May 21, 2020 · e30b549 · e30b549
2 parents 87dd6d9 + 3040766
commit e30b549
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
@@ -252,6 +252,7 @@ curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VER
 # install docker-ce (w/ install-recommends)
 apt-get install -y --force-yes \
   --no-install-recommends \
+  "docker-ce-cli=${DOCKER_CE_VERSION}" \
   "docker-ce=${DOCKER_CE_VERSION}"
 
 # install bash completion for Docker CLI

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.4/m }
+  its(:stdout) { should match /1.25.5/m }
   its(:exit_status) { should eq 0 }
 end
 

diff --git a/versions.config b/versions.config
@@ -13,5 +13,5 @@ RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c
 # export KERNEL_VERSION="4.19.97"
 export DOCKER_CE_CHANNEL="stable" # stable, test or edge
 export DOCKER_CE_VERSION="5:19.03.8~3-0~raspbian-buster"
-export DOCKER_COMPOSE_VERSION="1.25.4"
+export DOCKER_COMPOSE_VERSION="1.25.5"
 export DOCKER_MACHINE_VERSION="0.16.2"