Merge branch 'master' into test

conf/config.go

@@ -29,6 +29,7 @@ type Config struct {
 	WaitLastTaskExecTime     int64   `json:"wait_last_task_exec_time"`
 	OpSys                    string  `json:"op_sys"`
 	ReplicateImageNameSuffix string  `json:"replicate_image_name_suffix"`
+	IsStopLastContainer      bool    `json:"is_stop_last_container"`
 }
 
 var _cfg *Config = nil

config.json

@@ -10,5 +10,6 @@
   "oss_url": "https://tmp-file.aigic.ai/api/v1/upload",
   "wait_last_task_exec_time": 60,
   "op_sys": "linux",
-  "replicate_image_name_suffix": "docker.aigic.ai/ai"
+  "replicate_image_name_suffix": "docker.aigic.ai/ai",
+  "is_stop_last_container": true
 }
\ No newline at end of file

nm/task_handler.go

@@ -156,7 +156,7 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 	taskOp.taskCmd.ImageName = fmt.Sprintf("%s-%s", taskOp.taskCmd.ImageName, conf.GetConfig().OpSys)
 	log.Info("received task cmd :", taskOp.taskCmd)
 	log.WithField("t.oldTaskImageName", t.oldTaskImageName).WithField("newTaskImageName", taskOp.taskCmd.ImageName).Info("task image info")
-	if taskMsg.TaskKind != baseV1.TaskKind_StandardTask {
+	if taskMsg.TaskKind != baseV1.TaskKind_StandardTask && conf.GetConfig().IsStopLastContainer {
 		t.checkIsStopContainer(taskOp.taskCmd)
 	}
 	log.Info("check is stop container finished")