moby
diff --git a/‎integration-cli/docker_cli_kill_test.go‎
Lines changed: 0 additions & 25 deletions b/‎integration-cli/docker_cli_kill_test.go‎
Lines changed: 0 additions & 25 deletions
diff --git a/‎integration/container/kill_test.go‎
Lines changed: 18 additions & 0 deletions b/‎integration/container/kill_test.go‎
Lines changed: 18 additions & 0 deletions
@@ -175,3 +175,21 @@ func TestKillStoppedContainerAPIPre120(t *testing.T) {
 	err = client.ContainerKill(ctx, c.ID, "SIGKILL")
 	require.NoError(t, err)
 }
+
+func TestKillDifferentUserContainer(t *testing.T) {
+	// TODO Windows: Windows does not yet support -u (Feb 2016).
+	skip.If(t, testEnv.OSType != "linux", "User containers (container.Config.User) are not yet supported on %q platform", testEnv.OSType)
+
+	defer setupTest(t)()
+	ctx := context.Background()
+	client := request.NewAPIClient(t, client.WithVersion("1.19"))
+
+	cID := runSimpleContainer(ctx, t, client, "", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
+		config.User = "daemon"
+	})
+	poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+	err := client.ContainerKill(ctx, cID, "SIGKILL")
+	require.NoError(t, err)
+	poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
+}