mirrors/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-11-26 14:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tunnels): make the tunnels more robust EE-7042 (#11877)

Browse Source
This commit is contained in:
andres-portainer
2024-05-28 16:42:56 -03:00
committed by GitHub
parent aaab2fa9d8
commit c5a1d7e051
20 changed files with 389 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/exec/swarm_stack.go
View File

@@ -3,7 +3,6 @@ package exec
import (
"bytes"
"errors"
"fmt"
"os"
"os/exec"
"path"
@@ -186,11 +185,11 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, config
endpointURL := endpoint.URL
if endpoint.Type == portainer.EdgeAgentOnDockerEnvironment {
tunnel, err := manager.reverseTunnelService.GetActiveTunnel(endpoint)
tunnelAddr, err := manager.reverseTunnelService.TunnelAddr(endpoint)
if err != nil {
return "", nil, err
}
endpointURL = fmt.Sprintf("tcp://127.0.0.1:%d", tunnel.Port)
endpointURL = "tcp://" + tunnelAddr
}
args = append(args, "-H", endpointURL)