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

[agent-deploy] - cmii new app deploy

Browse Source
This commit is contained in:
zeaslity
2024-07-17 10:56:44 +08:00
parent 408bb9b83f
commit 809a67ccc2
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -859,18 +859,16 @@ func (op *AgentOsOperator) installDockerExec(args []string) (bool, []string) {
"20",
}
}
// todo ubuntu 22.04
// ubuntu 内部
//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 {
//
//}
// 20.04 default
specificDockerVersion := "5:20.10.20~3-0~ubuntu-" + op.AgentOSReleaseCode
// apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'
specificDockerVersion := "5:20.10.10~3-0~ubuntu-" + op.AgentOSReleaseCode
// get by method
ok, log4 := HardCodeCommandExecutor("apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'")
if ok {
specificDockerVersion = strings.TrimSpace(log4[0])
}
log.InfoF("需要安装的docker版本为 => %s", specificDockerVersion)