@@ -291,12 +291,6 @@ func TestDockerCLIPushSuite(t *testing.T) {

 	suite.Run(ctx, t, &DockerCLIPushSuite{ds: &DockerSuite{}})

 }

-func TestDockerCLIRestartSuite(t *testing.T) {

-	ctx := testutil.StartSpan(baseContext, t)

-	ensureTestEnvSetup(ctx, t)

-	suite.Run(ctx, t, &DockerCLIRestartSuite{ds: &DockerSuite{}})

-}

-

 func TestDockerCLIRmiSuite(t *testing.T) {

 	ctx := testutil.StartSpan(baseContext, t)

 	ensureTestEnvSetup(ctx, t)

deleted file mode 100644

@@ -1,277 +0,0 @@

-package main

-

-import (

-	"context"

-	"os"

-	"strconv"

-	"strings"

-	"testing"

-	"time"

-

-	"github.com/moby/moby/v2/integration-cli/checker"

-	"github.com/moby/moby/v2/integration-cli/cli"

-	"gotest.tools/v3/assert"

-	is "gotest.tools/v3/assert/cmp"

-	"gotest.tools/v3/poll"

-	"gotest.tools/v3/skip"

-)

-

-type DockerCLIRestartSuite struct {

-	ds *DockerSuite

-}

-

-func (s *DockerCLIRestartSuite) TearDownTest(ctx context.Context, t *testing.T) {

-	s.ds.TearDownTest(ctx, t)

-}

-

-func (s *DockerCLIRestartSuite) OnTimeout(t *testing.T) {

-	s.ds.OnTimeout(t)

-}

-

-func (s *DockerCLIRestartSuite) TestRestartStoppedContainer(c *testing.T) {

-	cID := cli.DockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo foobar && exit 0").Stdout()

-	cID = strings.TrimSpace(cID)

-

-	getLogs := func(t *testing.T) (any, string) {

-		out := cli.DockerCmd(t, "logs", cID).Combined()

-		return out, ""

-	}

-

-	// Wait 10 seconds for the 'echo' to appear in the logs

-	poll.WaitOn(c, pollCheck(c, getLogs, checker.Equals("foobar\n")), poll.WithTimeout(10*time.Second))

-

-	// Make sure the container has stopped before we restart it.

-	cli.WaitExited(c, cID, 20*time.Second)

-	cli.DockerCmd(c, "restart", cID)

-

-	poll.WaitOn(c, pollCheck(c, getLogs, checker.Equals("foobar\nfoobar\n")), poll.WithTimeout(10*time.Second))

-}

-

-func (s *DockerCLIRestartSuite) TestRestartRunningContainer(c *testing.T) {

-	cID := cli.DockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo foobar && sleep 30 && echo 'should not print this'").Stdout()

-	cID = strings.TrimSpace(cID)

-	cli.WaitRun(c, cID)

-

-	getLogs := func(t *testing.T) (any, string) {

-		out := cli.DockerCmd(t, "logs", cID).Combined()

-		return out, ""

-	}

-

-	// Wait 10 seconds for the 'echo' to appear in the logs

-	poll.WaitOn(c, pollCheck(c, getLogs, checker.Equals("foobar\n")), poll.WithTimeout(10*time.Second))

-

-	cli.DockerCmd(c, "restart", "-t", "1", cID)

-	cli.WaitRun(c, cID)

-

-	// Wait 10 seconds for first 'echo' appear (again) in the logs

-	poll.WaitOn(c, pollCheck(c, getLogs, checker.Equals("foobar\nfoobar\n")), poll.WithTimeout(10*time.Second))

-}

-

-// Test that restarting a container with a volume does not create a new volume on restart. Regression test for #819.

-func (s *DockerCLIRestartSuite) TestRestartWithVolumes(c *testing.T) {

-	cID := runSleepingContainer(c, "-d", "-v", dPath("/test"))

-	out, err := inspectFilter(cID, "len .Mounts")

-	assert.NilError(c, err, "failed to inspect %s: %s", cID, out)

-	out = strings.Trim(out, " \n\r")

-	assert.Equal(c, out, "1")

-

-	mnt, err := inspectMountPoint(cID, dPath("/test"))

-	assert.NilError(c, err)

-

-	cli.DockerCmd(c, "restart", cID)

-

-	out, err = inspectFilter(cID, "len .Mounts")

-	assert.NilError(c, err, "failed to inspect %s: %s", cID, out)

-	out = strings.Trim(out, " \n\r")

-	assert.Equal(c, out, "1")

-

-	mountAfterRestart, err := inspectMountPoint(cID, dPath("/test"))

-	assert.NilError(c, err)

-	assert.Equal(c, mnt.Source, mountAfterRestart.Source)

-}

-

-func (s *DockerCLIRestartSuite) TestRestartDisconnectedContainer(c *testing.T) {

-	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon, NotUserNamespace)

-

-	// Run a container on the default bridge network

-	cID := cli.DockerCmd(c, "run", "-d", "--name", "c0", "busybox", "top").Stdout()

-	cID = strings.TrimSpace(cID)

-	cli.WaitRun(c, cID)

-

-	// Disconnect the container from the network

-	result := cli.DockerCmd(c, "network", "disconnect", "bridge", "c0")

-	assert.Assert(c, result.ExitCode == 0, result.Combined())

-

-	// Restart the container

-	result = cli.DockerCmd(c, "restart", "c0")

-	assert.Assert(c, result.ExitCode == 0, result.Combined())

-}

-

-func (s *DockerCLIRestartSuite) TestRestartPolicyNO(c *testing.T) {

-	cID := cli.DockerCmd(c, "create", "--restart=no", "busybox").Stdout()

-	cID = strings.TrimSpace(cID)

-	name := inspectField(c, cID, "HostConfig.RestartPolicy.Name")

-	assert.Equal(c, name, "no")

-}

-

-func (s *DockerCLIRestartSuite) TestRestartPolicyAlways(c *testing.T) {

-	id := cli.DockerCmd(c, "create", "--restart=always", "busybox").Stdout()

-	id = strings.TrimSpace(id)

-	name := inspectField(c, id, "HostConfig.RestartPolicy.Name")

-	assert.Equal(c, name, "always")

-

-	MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")

-

-	// MaximumRetryCount=0 if the restart policy is always

-	assert.Equal(c, MaximumRetryCount, "0")

-}

-

-func (s *DockerCLIRestartSuite) TestRestartPolicyOnFailure(c *testing.T) {

-	out, _, err := dockerCmdWithError("create", "--restart=on-failure:-1", "busybox")

-	assert.ErrorContains(c, err, "", out)

-	assert.Assert(c, is.Contains(out, "maximum retry count cannot be negative"))

-

-	id := cli.DockerCmd(c, "create", "--restart=on-failure:1", "busybox").Stdout()

-	id = strings.TrimSpace(id)

-	name := inspectField(c, id, "HostConfig.RestartPolicy.Name")

-	maxRetry := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")

-	assert.Equal(c, name, "on-failure")

-	assert.Equal(c, maxRetry, "1")

-

-	id = cli.DockerCmd(c, "create", "--restart=on-failure:0", "busybox").Stdout()

-	id = strings.TrimSpace(id)

-	name = inspectField(c, id, "HostConfig.RestartPolicy.Name")

-	maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")

-	assert.Equal(c, name, "on-failure")

-	assert.Equal(c, maxRetry, "0")

-

-	id = cli.DockerCmd(c, "create", "--restart=on-failure", "busybox").Stdout()

-	id = strings.TrimSpace(id)

-	name = inspectField(c, id, "HostConfig.RestartPolicy.Name")

-	maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")

-	assert.Equal(c, name, "on-failure")

-	assert.Equal(c, maxRetry, "0")

-}

-

-func (s *DockerCLIRestartSuite) TestRestartContainerSuccess(c *testing.T) {

-	testRequires(c, testEnv.IsLocalDaemon)

-	// Skipped for Hyper-V isolated containers. Test is currently written

-	// such that it assumes there is a host process to kill. In Hyper-V

-	// containers, the process is inside the utility VM, not on the host.

-	if DaemonIsWindows() {

-		skip.If(c, testEnv.GitHubActions())

-		testRequires(c, testEnv.DaemonInfo.Isolation.IsProcess)

-	}

-

-	id := runSleepingContainer(c, "-d", "--restart=always")

-	cli.WaitRun(c, id)

-

-	pidStr := inspectField(c, id, "State.Pid")

-

-	pid, err := strconv.Atoi(pidStr)

-	assert.NilError(c, err)

-

-	p, err := os.FindProcess(pid)

-	assert.NilError(c, err)

-	assert.Assert(c, p != nil)

-

-	err = p.Kill()

-	assert.NilError(c, err)

-

-	err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)

-	assert.NilError(c, err)

-

-	err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)

-	assert.NilError(c, err)

-}

-

-func (s *DockerCLIRestartSuite) TestRestartWithPolicyUserDefinedNetwork(c *testing.T) {

-	// TODO Windows. This may be portable following HNS integration post TP5.

-	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon, NotUserNamespace)

-	cli.DockerCmd(c, "network", "create", "-d", "bridge", "udNet")

-

-	cli.DockerCmd(c, "run", "-d", "--net=udNet", "--name=first", "busybox", "top")

-	cli.WaitRun(c, "first")

-

-	cli.DockerCmd(c, "run", "-d", "--restart=always", "--net=udNet", "--name=second", "--link=first:foo", "busybox", "top")

-	cli.WaitRun(c, "second")

-

-	// ping to first and its alias foo must succeed

-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")

-	assert.NilError(c, err)

-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")

-	assert.NilError(c, err)

-

-	// Now kill the second container and let the restart policy kick in

-	pidStr := inspectField(c, "second", "State.Pid")

-

-	pid, err := strconv.Atoi(pidStr)

-	assert.NilError(c, err)

-

-	p, err := os.FindProcess(pid)

-	assert.NilError(c, err)

-	assert.Assert(c, p != nil)

-

-	err = p.Kill()

-	assert.NilError(c, err)

-

-	err = waitInspect("second", "{{.RestartCount}}", "1", 5*time.Second)

-	assert.NilError(c, err)

-

-	err = waitInspect("second", "{{.State.Status}}", "running", 5*time.Second)

-	assert.NilError(c, err)

-

-	// ping to first and its alias foo must still succeed

-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")

-	assert.NilError(c, err)

-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")

-	assert.NilError(c, err)

-}

-

-func (s *DockerCLIRestartSuite) TestRestartPolicyAfterRestart(c *testing.T) {

-	testRequires(c, testEnv.IsLocalDaemon)

-	// Skipped for Hyper-V isolated containers. Test is currently written

-	// such that it assumes there is a host process to kill. In Hyper-V

-	// containers, the process is inside the utility VM, not on the host.

-	if DaemonIsWindows() {

-		skip.If(c, testEnv.GitHubActions())

-		testRequires(c, testEnv.DaemonInfo.Isolation.IsProcess)

-	}

-

-	id := runSleepingContainer(c, "-d", "--restart=always")

-	cli.WaitRun(c, id)

-

-	cli.DockerCmd(c, "restart", id)

-	cli.WaitRun(c, id)

-

-	pidStr := inspectField(c, id, "State.Pid")

-

-	pid, err := strconv.Atoi(pidStr)

-	assert.NilError(c, err)

-

-	p, err := os.FindProcess(pid)

-	assert.NilError(c, err)

-	assert.Assert(c, p != nil)

-

-	err = p.Kill()

-	assert.NilError(c, err)

-

-	err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)

-	assert.NilError(c, err)

-

-	err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)

-	assert.NilError(c, err)

-}

-

-func (s *DockerCLIRestartSuite) TestRestartAutoRemoveContainer(c *testing.T) {

-	id := runSleepingContainer(c, "--rm")

-	cli.DockerCmd(c, "restart", id)

-	err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false true", 15*time.Second)

-	assert.NilError(c, err)

-

-	out := cli.DockerCmd(c, "ps").Stdout()

-	assert.Assert(c, is.Contains(out, id[:12]), "container should be restarted instead of removed: %v", out)

-

-	// Kill the container to make sure it will be removed

-	cli.DockerCmd(c, "kill", id)

-}

@@ -10,10 +10,12 @@ import (

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/events"

+	networktypes "github.com/moby/moby/api/types/network"

 	"github.com/moby/moby/client"

 	testContainer "github.com/moby/moby/v2/integration/internal/container"

 	"github.com/moby/moby/v2/internal/testutil"

 	"github.com/moby/moby/v2/internal/testutil/daemon"

+	"github.com/moby/moby/v2/pkg/process"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 	"gotest.tools/v3/poll"

@@ -162,6 +164,149 @@ func pollForNewHealthCheck(ctx context.Context, apiClient *client.Client, startT

 	}

 }

+func TestContainerRestartStoppedContainer(t *testing.T) {

+	ctx := setupTest(t)

+	apiClient := testEnv.APIClient()

+

+	cID := testContainer.Create(ctx, t, apiClient, testContainer.WithCmd("sh", "-c", "echo foobar && exit 0"))

+

+	waitTimeout := 10 * time.Second

+	if testEnv.DaemonInfo.OSType == "windows" {

+		waitTimeout = StopContainerWindowsPollTimeout

+	}

+

+	waitCtx, cancel := context.WithTimeout(ctx, waitTimeout)

+	defer cancel()

+	wait := apiClient.ContainerWait(waitCtx, cID, client.ContainerWaitOptions{Condition: container.WaitConditionNextExit})

+

+	_, err := apiClient.ContainerStart(ctx, cID, client.ContainerStartOptions{})

+	assert.NilError(t, err)

+	assertContainerExitCode(t, wait, 0, waitTimeout)

+	poll.WaitOn(t, logsContains(ctx, apiClient, cID, "foobar\n"), poll.WithTimeout(waitTimeout))

+

+	waitCtx, cancel = context.WithTimeout(ctx, waitTimeout)

+	defer cancel()

+	wait = apiClient.ContainerWait(waitCtx, cID, client.ContainerWaitOptions{Condition: container.WaitConditionNextExit})

+

+	_, err = apiClient.ContainerRestart(ctx, cID, client.ContainerRestartOptions{})

+	assert.NilError(t, err)

+	assertContainerExitCode(t, wait, 0, waitTimeout)

+	poll.WaitOn(t, logsContains(ctx, apiClient, cID, "foobar\nfoobar\n"), poll.WithTimeout(waitTimeout))

+}

+

+func TestContainerRestartWithVolumes(t *testing.T) {

+	ctx := setupTest(t)

+	apiClient := testEnv.APIClient()

+

+	cID := testContainer.Run(ctx, t, apiClient, testContainer.WithVolume(dPath("/test")))

+

+	inspect, err := apiClient.ContainerInspect(ctx, cID, client.ContainerInspectOptions{})

+	assert.NilError(t, err)

+	assert.Assert(t, is.Len(inspect.Container.Mounts, 1))

+	mountSource := inspect.Container.Mounts[0].Source

+

+	_, err = apiClient.ContainerRestart(ctx, cID, client.ContainerRestartOptions{})

+	assert.NilError(t, err)

+

+	inspect, err = apiClient.ContainerInspect(ctx, cID, client.ContainerInspectOptions{})

+	assert.NilError(t, err)

+	assert.Assert(t, is.Len(inspect.Container.Mounts, 1))

+	assert.Check(t, is.Equal(inspect.Container.Mounts[0].Source, mountSource))

+}

+

+func TestContainerRestartPolicyAfterProcessExit(t *testing.T) {

+	skip.If(t, testEnv.IsRemoteDaemon, "test requires daemon on the same host")

+	skip.If(t, testEnv.DaemonInfo.OSType == "windows" && testEnv.DaemonInfo.Isolation != "process")

+

+	ctx := setupTest(t)

+	apiClient := testEnv.APIClient()

+

+	for _, tc := range []struct {

+		name          string

+		manualRestart bool

+	}{

+		{name: "direct-process-exit"},

+		{name: "after-manual-restart", manualRestart: true},

+	} {

+		t.Run(tc.name, func(t *testing.T) {

+			ctx := testutil.StartSpan(ctx, t)

+

+			cID := testContainer.Run(ctx, t, apiClient, testContainer.WithRestartPolicy(container.RestartPolicyAlways))

+

+			if tc.manualRestart {

+				_, err := apiClient.ContainerRestart(ctx, cID, client.ContainerRestartOptions{})

+				assert.NilError(t, err)

+				poll.WaitOn(t, testContainer.IsInState(ctx, apiClient, cID, container.StateRunning), poll.WithTimeout(30*time.Second))

+			}

+

+			killContainerProcess(ctx, t, apiClient, cID)

+			poll.WaitOn(t, containerRestartCountIs(ctx, apiClient, cID, 1), poll.WithTimeout(30*time.Second))

+			poll.WaitOn(t, testContainer.IsInState(ctx, apiClient, cID, container.StateRunning), poll.WithTimeout(30*time.Second))

+		})

+	}

+}

+

+func TestContainerRestartPolicyUserDefinedNetwork(t *testing.T) {

+	skip.If(t, testEnv.DaemonInfo.OSType != "linux")

+	skip.If(t, testEnv.IsRemoteDaemon, "test requires daemon on the same host")

+	skip.If(t, testEnv.IsUserNamespace)

+

+	ctx := setupTest(t)

+	apiClient := testEnv.APIClient()

+

+	suffix := strconv.FormatInt(time.Now().UnixNano(), 10)

+	networkName := "restart-policy-network-" + suffix

+	firstName := "restart-first-" + suffix

+	secondName := "restart-second-" + suffix

+

+	_, err := apiClient.NetworkCreate(ctx, networkName, client.NetworkCreateOptions{Driver: "bridge"})

+	assert.NilError(t, err)

+

+	testContainer.Run(ctx, t, apiClient,

+		testContainer.WithName(firstName),

+		testContainer.WithNetworkMode(networkName),

+		testContainer.WithEndpointSettings(networkName, &networktypes.EndpointSettings{Aliases: []string{"foo"}}),

+	)

+

+	secondID := testContainer.Run(ctx, t, apiClient,

+		testContainer.WithName(secondName),

+		testContainer.WithNetworkMode(networkName),

+		testContainer.WithRestartPolicy(container.RestartPolicyAlways),

+	)

+

+	testContainer.ExecT(ctx, t, apiClient, secondID, []string{"ping", "-c", "1", firstName}).AssertSuccess(t)

+	testContainer.ExecT(ctx, t, apiClient, secondID, []string{"ping", "-c", "1", "foo"}).AssertSuccess(t)

+

+	killContainerProcess(ctx, t, apiClient, secondID)

+	poll.WaitOn(t, containerRestartCountIs(ctx, apiClient, secondID, 1), poll.WithTimeout(30*time.Second))

+	poll.WaitOn(t, testContainer.IsInState(ctx, apiClient, secondID, container.StateRunning), poll.WithTimeout(30*time.Second))

+

+	testContainer.ExecT(ctx, t, apiClient, secondID, []string{"ping", "-c", "1", firstName}).AssertSuccess(t)

+	testContainer.ExecT(ctx, t, apiClient, secondID, []string{"ping", "-c", "1", "foo"}).AssertSuccess(t)

+}

+

+func killContainerProcess(ctx context.Context, t *testing.T, apiClient client.APIClient, containerID string) {

+	t.Helper()

+

+	inspect, err := apiClient.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})

+	assert.NilError(t, err)

+

+	assert.NilError(t, process.Kill(inspect.Container.State.Pid))

+}

+

+func assertContainerExitCode(t *testing.T, wait client.ContainerWaitResult, expected int64, timeout time.Duration) {

+	t.Helper()

+

+	select {

+	case err := <-wait.Error:

+		assert.NilError(t, err)

+	case res := <-wait.Result:

+		assert.Check(t, is.Equal(res.StatusCode, expected))

+	case <-time.After(timeout):

+		t.Fatal("timeout waiting for container exit")

+	}

+}

+

 func TestContainerRestartPolicyOnFailure(t *testing.T) {

 	ctx := setupTest(t)

 	apiClient := testEnv.APIClient()