From 7a03351df8c9017244da4062fa94812011ff5c54 Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Thu, 14 Jan 2021 23:05:33 +0200 Subject: [PATCH] dep(api): Support Docker Stack 3.8 (#4333) - Linux: Update Docker binary to version 19.03.13 - Windows: Update Docker binary to version 19.03.12 --- api/exec/swarm_stack.go | 2 ++ build/download_docker_binary.ps1 | 3 ++- gruntfile.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/exec/swarm_stack.go b/api/exec/swarm_stack.go index 31fb48836..cf59f7607 100644 --- a/api/exec/swarm_stack.go +++ b/api/exec/swarm_stack.go @@ -134,6 +134,8 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, dataPa if !endpoint.TLSConfig.TLSSkipVerify { args = append(args, "--tlsverify", "--tlscacert", endpoint.TLSConfig.TLSCACertPath) + } else { + args = append(args, "--tlscacert", "''") } if endpoint.TLSConfig.TLSCertPath != "" && endpoint.TLSConfig.TLSKeyPath != "" { diff --git a/build/download_docker_binary.ps1 b/build/download_docker_binary.ps1 index a567ff785..775a3f9aa 100644 --- a/build/download_docker_binary.ps1 +++ b/build/download_docker_binary.ps1 @@ -9,6 +9,7 @@ New-Item -Path "docker-binary" -ItemType Directory | Out-Null $download_folder = "docker-binary" -Invoke-WebRequest -O "$($download_folder)/docker-binaries.zip" "https://download.docker.com/win/static/stable/x86_64/docker-$($docker_version).zip" +Invoke-WebRequest -O "$($download_folder)/docker-binaries.zip" "https://dockermsft.azureedge.net/dockercontainer/docker-$($docker_version).zip" Expand-Archive -Path "$($download_folder)/docker-binaries.zip" -DestinationPath "$($download_folder)" Move-Item -Path "$($download_folder)/docker/docker.exe" -Destination "dist" +Move-Item -Path "$($download_folder)/docker/*.dll" -Destination "dist" diff --git a/gruntfile.js b/gruntfile.js index c9da104db..218f9d4d8 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -17,8 +17,8 @@ module.exports = function (grunt) { root: 'dist', distdir: 'dist/public', binaries: { - dockerLinuxVersion: '18.09.3', - dockerWindowsVersion: '17.09.0-ce', + dockerLinuxVersion: '19.03.13', + dockerWindowsVersion: '19-03-12', komposeVersion: 'v1.21.0', kubectlVersion: 'v1.18.0', },