kill: Don't return an error if container state is 'created'

Regarding a recent update of the OCI specification, we don't want to generate an error when 'kill' command is called on a container which has been created but not started. This is basically a no-op in our case. Signed-off-by: Sebastien Boeuf <[email protected]>
clearcontainers · Jun 26, 2017 · bcba230 · bcba230
1 parent 2c431f7
commit bcba230
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)
 	}