Skip to content

Commit 14d9827

Browse files
author
James Healy
authored
Merge pull request #825 from buildkite/bump-docker-compose
Update docker-compose on all operating systems to 1.28.x
2 parents bffd450 + eb5d067 commit 14d9827

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

packer/linux/scripts/install-docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eu -o pipefail
33

44
DOCKER_VERSION=20.10.6
55
DOCKER_RELEASE="stable"
6-
DOCKER_COMPOSE_VERSION=1.27.4
6+
DOCKER_COMPOSE_VERSION=1.28.6
77
MACHINE=$(uname -m)
88

99
# This performs a manual install of Docker.
@@ -47,7 +47,7 @@ elif [[ "${MACHINE}" == "aarch64" ]]; then
4747
# https://github.com/docker/compose/issues/7472
4848
CONSTRAINT_FILE="/tmp/docker-compose-pip-constraint"
4949
echo 'cryptography<3.4' >"$CONSTRAINT_FILE"
50-
sudo pip3 install --constraint "$CONSTRAINT_FILE" docker-compose
50+
sudo pip3 install --constraint "$CONSTRAINT_FILE" "docker-compose==${DOCKER_COMPOSE_VERSION}"
5151

5252
docker-compose version
5353
else

packer/windows/scripts/install-docker.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
$ErrorActionPreference = "Stop"
33

44
$docker_version="20.10.0"
5+
$docker_compose_version="1.28.5"
56

67
Write-Output "Upgrading DockerMsftProvider module"
78
Update-Module -Name DockerMsftProvider -Force
@@ -15,7 +16,7 @@ Install-Package -Name docker -ProviderName DockerMsftProvider -Force -RequiredVe
1516
Start-Service docker
1617

1718
Write-Output "Installing docker-compose"
18-
choco install -y docker-compose
19+
choco install -y docker-compose --version $docker_compose_version
1920
If ($lastexitcode -ne 0) { Exit $lastexitcode }
2021

2122
Write-Output "Installing jq"

0 commit comments

Comments
 (0)