Merge pull request #245 from clearcontainers/sboeuf/fix_kill

kill: Don't return an error if container state is 'created'
clearcontainers · Jun 27, 2017 · 4ffb2c4 · 4ffb2c4
2 parents 157d907 + 780f52d
commit 4ffb2c4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/kill.go b/kill.go
@@ -106,8 +106,11 @@ func kill(containerID, signal string, all bool) error {
 
 	containerID = status.ID
 
-	// container MUST be running
-	if status.State.State != vc.StateRunning {
+	// container MUST be created or running
+	if status.State.State == vc.StateReady {
+		ccLog.Infof("Container %s state 'created', nothing to do", containerID)
+		return nil
+	} else if status.State.State != vc.StateRunning {
 		return fmt.Errorf("Container %s is not running", containerID)
 	}