mirror of https://github.com/portainer/portainer
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.12fix-4503-cannot-access-configuration-details-view-containing-binary-data
parent
0c2987893d
commit
7a03351df8
|
@ -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 != "" {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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',
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue