Merge branch 'main' into local-ss

agent-go/a_executor/BaseFunction.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"path/filepath"
 	"strings"
+
 	"wdd.io/agent-go/a_agent"
 	"wdd.io/agent-go/a_executor/beans"
 )
@@ -943,7 +945,7 @@ func (op *AgentOsOperator) InstallDockerBastion() (bool, []string) {
 
 	BasicRemoveFolderComplete("/root/wdd/docker")
 
-	dockerLocalFile := OctopusAgentInstallPrefix + dockerOfflineFileName
+	dockerLocalFile := filepath.Join(OctopusAgentInstallPrefix, dockerOfflineFileName)
 
 	// 下载
 	if op.CanAccessInternet {
@@ -962,7 +964,7 @@ func (op *AgentOsOperator) InstallDockerBastion() (bool, []string) {
 		"-vxf",
 		dockerLocalFile,
 		"-C",
-		"/root/wdd",
+		"/root/wdd/",
 	})
 
 	HardCodeCommandExecutor("chmod 777 -R /root/wdd/docker/*")