Skip to content
This repository was archived by the owner on Aug 14, 2023. It is now read-only.

Commit e30b549

Browse files
Merge pull request #357 from hypriot/compose-1.25.5
Update docker-compose 1.25.5
2 parents 87dd6d9 + 3040766 commit e30b549

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

builder/chroot-script.sh

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VER
252252
# install docker-ce (w/ install-recommends)
253253
apt-get install -y --force-yes \
254254
--no-install-recommends \
255+
"docker-ce-cli=${DOCKER_CE_VERSION}" \
255256
"docker-ce=${DOCKER_CE_VERSION}"
256257

257258
# install bash completion for Docker CLI

builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
describe command('docker-compose --version') do
10-
its(:stdout) { should match /1.25.4/m }
10+
its(:stdout) { should match /1.25.5/m }
1111
its(:exit_status) { should eq 0 }
1212
end
1313

versions.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c
1313
# export KERNEL_VERSION="4.19.97"
1414
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
1515
export DOCKER_CE_VERSION="5:19.03.8~3-0~raspbian-buster"
16-
export DOCKER_COMPOSE_VERSION="1.25.4"
16+
export DOCKER_COMPOSE_VERSION="1.25.5"
1717
export DOCKER_MACHINE_VERSION="0.16.2"

0 commit comments

Comments
 (0)