zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[agent-deploy] - xzyd project

Browse Source
This commit is contained in:
zeaslity
2024-05-10 10:52:21 +08:00
parent f1b432fc3a
commit 836e8f631b
22 changed files with 11418 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-go/a_executor/AppFunction.go
View File

@@ -353,7 +353,7 @@ func (op *AgentOsOperator) deployTestNFS(funcArgs []string) (bool, []string) {
}
// 下载模板文件
k8sNFSYamlFile := "/root/wdd/install/k8s-nfs-test.json"
k8sNFSYamlFile := "/root/wdd/install/k8s-nfs-test.yaml"
ok, resultLog := BasicDownloadFileByCurl(op.OssOfflinePrefix+nfsTemplateFile, k8sNFSYamlFile)
if !ok {
return false, resultLog

14
agent-go/a_executor/BaseFunction.go
View File

@@ -862,13 +862,15 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) {
// todo ubuntu 22.04
// ubuntu 内部
var specificDockerVersion string
//var specificDockerVersion string
// hard code here 5:20.10.10~3-0~ubuntu-focal
if strings.HasPrefix(args[0], "19") {
specificDockerVersion = "5:19.03.15~3-0~ubuntu-" + op.AgentOSReleaseCode
} else {
specificDockerVersion = "5:20.10.10~3-0~ubuntu-" + op.AgentOSReleaseCode
}
//if strings.HasPrefix(args[0], "19") {
// specificDockerVersion = "5:19.03.15~3-0~ubuntu-" + op.AgentOSReleaseCode
//} else {
//
//}
specificDockerVersion := "5:20.10.10~3-0~ubuntu-" + op.AgentOSReleaseCode
log.InfoF("需要安装的docker版本为 => %s", specificDockerVersion)