github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

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
fix-4503-cannot-access-configuration-details-view-containing-binary-data
Olli Janatuinen 2021-01-14 23:05:33 +02:00 committed by GitHub
parent 0c2987893d
commit 7a03351df8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/exec/swarm_stack.go
View File

@ -134,6 +134,8 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, dataPa
if !endpoint.TLSConfig.TLSSkipVerify { if !endpoint.TLSConfig.TLSSkipVerify {
args = append(args, "--tlsverify", "--tlscacert", endpoint.TLSConfig.TLSCACertPath) args = append(args, "--tlsverify", "--tlscacert", endpoint.TLSConfig.TLSCACertPath)
} else {
args = append(args, "--tlscacert", "''")
} }
if endpoint.TLSConfig.TLSCertPath != "" && endpoint.TLSConfig.TLSKeyPath != "" { if endpoint.TLSConfig.TLSCertPath != "" && endpoint.TLSConfig.TLSKeyPath != "" {

3
build/download_docker_binary.ps1
View File

@ -9,6 +9,7 @@ New-Item -Path "docker-binary" -ItemType Directory | Out-Null
$download_folder = "docker-binary" $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)" 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/docker.exe" -Destination "dist"
Move-Item -Path "$($download_folder)/docker/*.dll" -Destination "dist"

4
gruntfile.js
View File

@ -17,8 +17,8 @@ module.exports = function (grunt) {
root: 'dist', root: 'dist',
distdir: 'dist/public', distdir: 'dist/public',
binaries: { binaries: {
dockerLinuxVersion: '18.09.3', dockerLinuxVersion: '19.03.13',
dockerWindowsVersion: '17.09.0-ce', dockerWindowsVersion: '19-03-12',
komposeVersion: 'v1.21.0', komposeVersion: 'v1.21.0',
kubectlVersion: 'v1.18.0', kubectlVersion: 'v1.18.0',
}, },