[agent-deploy] - cmii new app deploy

agent-go/a_executor/BaseFunction.go

@@ -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)
 

agent-go/a_executor/BaseFunction_test.go

@@ -40,7 +40,6 @@ var agentOP = &AgentOsOperator{
 		Comment:        "",
 		MachineID:      "",
 		AgentVersion:   "",
-		TopicName:      "",
 	},
 	OssOfflinePrefix: "http://10.250.0.100:9000/octopus/",
 }

agent-go/a_executor/FunctionalExecutor_test.go

@@ -175,6 +175,21 @@ func TestPipelineCommandExecutor2(t *testing.T) {
 	// Add more test cases as needed...
 }
 
+func TestHardCodeCommandExecutor(t *testing.T) {
+
+	// 20.04 default
+	specificDockerVersion := "5:20.10.20~3-0~ubuntu-focal"
+	// apt-cache madison docker-ce | grep 20.10.20 | awk '{print$3}'
+
+	// 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])
+	}
+
+	fmt.Println(specificDockerVersion)
+}
+
 func TestSimple(t *testing.T) {
 
 	for i := 0; i < 10; i++ {