Merge pull request #2 from trivago/improved-pot-container-naming

Improved naming for pot to handle multiple tasks

driver/handle.go

@@ -77,13 +77,16 @@ func (h *taskHandle) run() {
 // before killing the container with SIGKILL.
 func (h *taskHandle) shutdown(timeout time.Duration) error {
 	// Wait for the process to finish or kill it after a timeout (whichever happens first):
+	var fixTimeOut time.Duration
+	fixTimeOut = 5 * time.Second
+
 	h.procState = drivers.TaskStateExited
 	done := make(chan error, 1)
 	go func() {
 		done <- h.syexec.cmd.Wait()
 	}()
 	select {
-	case <-time.After(timeout * time.Second):
+	case <-time.After(fixTimeOut * time.Second):
 
 		if err := h.syexec.cmd.Process.Kill(); err != nil {
 			return fmt.Errorf("failed to kill process: %v ", err)

driver/prepare.go

@@ -52,7 +52,8 @@ func prepareContainer(cfg *drivers.TaskConfig, taskCfg TaskConfig) syexec {
 		}
 	}
 
-	argv = append(argv, "-n", cfg.JobName, "-v")
+	completeName := cfg.JobName + cfg.TaskGroupName
+	argv = append(argv, "-n", completeName, "-v")
 
 	se.argvCreate = append(argv, taskCfg.Args...)