Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker-compose on all operating systems to 1.28.x #825

Merged
merged 1 commit into from
Apr 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packer/linux/scripts/install-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eu -o pipefail

DOCKER_VERSION=20.10.6
DOCKER_RELEASE="stable"
DOCKER_COMPOSE_VERSION=1.27.4
DOCKER_COMPOSE_VERSION=1.28.6
MACHINE=$(uname -m)

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

docker-compose version
else
Expand Down
3 changes: 2 additions & 1 deletion packer/windows/scripts/install-docker.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
$ErrorActionPreference = "Stop"

$docker_version="20.10.0"
$docker_compose_version="1.28.5"

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

Write-Output "Installing docker-compose"
choco install -y docker-compose
choco install -y docker-compose --version $docker_compose_version
If ($lastexitcode -ne 0) { Exit $lastexitcode }

Write-Output "Installing jq"
Expand Down