From 0c0bda1361fd00a3ea1f5d34cd62270eb470a92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Busso?= Date: Mon, 18 Jan 2021 10:00:37 +1300 Subject: [PATCH] Fix platofrm specific docker-compose download --- build/download_docker_compose_binary.sh | 7 ++++--- gruntfile.js | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/download_docker_compose_binary.sh b/build/download_docker_compose_binary.sh index 55fb214b7..624cb269f 100755 --- a/build/download_docker_compose_binary.sh +++ b/build/download_docker_compose_binary.sh @@ -4,11 +4,12 @@ PLATFORM=$1 ARCH=$2 DOCKER_COMPOSE_VERSION=$3 -if [ "${PLATFORM}" == 'win' ]; then - wget -O "dist/docker-compose.exe" "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Windows-x86_64.exe" -elif [ "${PLATFORM}" == 'linux' ] && [ "${ARCH}" == 'amd64' ]; then +if [ "${PLATFORM}" == 'linux' ] && [ "${ARCH}" == 'amd64' ]; then wget -O "dist/docker-compose" "https://github.com/portainer/docker-compose-linux-amd64-static-binary/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose" chmod +x "dist/docker-compose" +elif [ "${PLATFORM}" == 'mac' ]; then + wget -O "dist/docker-compose" "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Darwin-x86_64" + chmod +x "dist/docker-compose" fi exit 0 diff --git a/gruntfile.js b/gruntfile.js index 72389e34a..0e37e9a54 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -218,13 +218,14 @@ function shell_download_docker_compose_binary(p, a) { if (p === 'linux' || p === 'mac') { return [ - 'if [ -f dist/docker ]; then', + 'if [ -f dist/docker-compose ]; then', 'echo "Docker Compose binary exists";', 'else', 'build/download_docker_compose_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', 'fi', ].join(' '); - } else { + } + if (p === 'win') { return [ 'powershell -Command "& {if (Test-Path -Path "dist/docker-compose.exe") {', 'Write-Host "Skipping download, Docker Compose binary exists"',