@@ -11,7 +11,6 @@ import (

 	"testing"

 	"github.com/docker/docker/api/types/versions"

-	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/testutil"

 	"github.com/docker/docker/testutil/request"

 	"gotest.tools/v3/assert"

@@ -79,7 +78,7 @@ func (s *DockerAPISuite) TestAPIErrorJSON(c *testing.T) {

 	assert.Assert(c, is.Contains(httpResp.Header.Get("Content-Type"), "application/json"))

 	b, err := request.ReadBody(body)

 	assert.NilError(c, err)

-	assert.Equal(c, getErrorMessage(c, b), runconfig.ErrEmptyConfig.Error())

+	assert.Check(c, is.Contains(getErrorMessage(c, b), "config cannot be empty"))

 }

 func (s *DockerAPISuite) TestAPIErrorNotFoundJSON(c *testing.T) {

@@ -10,7 +10,6 @@ import (

 	"testing"

 	"github.com/docker/docker/integration-cli/cli"

-	"github.com/docker/docker/runconfig"

 	"gotest.tools/v3/assert"

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

 )

@@ -225,7 +224,7 @@ func (s *DockerCLILinksSuite) TestLinksNetworkHostContainer(c *testing.T) {

 	// Running container linking to a container with --net host should have failed

 	assert.Check(c, err != nil, "out: %s", out)

 	// Running container linking to a container with --net host should have failed

-	assert.Check(c, is.Contains(out, runconfig.ErrConflictHostNetworkAndLinks.Error()))

+	assert.Check(c, is.Contains(out, "conflicting options: host type networking can't be used with links. This would result in undefined behavior"))

 }

 func (s *DockerCLILinksSuite) TestLinksEtcHostsRegularFile(c *testing.T) {

@@ -6,7 +6,6 @@ import (

 	"testing"

 	"github.com/docker/docker/integration-cli/cli"

-	"github.com/docker/docker/runconfig"

 	"gotest.tools/v3/assert"

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

 )

@@ -55,7 +54,7 @@ func (s *DockerCLINetmodeSuite) TestNetHostname(c *testing.T) {

 	out = cli.DockerCmd(c, "run", "-h=name", "--net=none", "busybox", "ps").Stdout()

 	assert.Assert(c, is.Contains(out, stringCheckPS))

 	out = dockerCmdWithFail(c, "run", "-h=name", "--net=container:other", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkHostname.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: hostname and the network mode"))

 	out = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps")

 	assert.Assert(c, is.Contains(out, "invalid container format container:<name|id>"))

 	out = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps")

@@ -66,34 +65,34 @@ func (s *DockerCLINetmodeSuite) TestConflictContainerNetworkAndLinks(c *testing.

 	testRequires(c, DaemonIsLinux)

 	out := dockerCmdWithFail(c, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictContainerNetworkAndLinks.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: container type network can't be used with links"))

 }

 func (s *DockerCLINetmodeSuite) TestConflictContainerNetworkHostAndLinks(c *testing.T) {

 	testRequires(c, DaemonIsLinux, NotUserNamespace)

 	out := dockerCmdWithFail(c, "run", "--net=host", "--link=zip:zap", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictHostNetworkAndLinks.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: host type networking can't be used with links"))

 }

 func (s *DockerCLINetmodeSuite) TestConflictNetworkModeNetHostAndOptions(c *testing.T) {

 	testRequires(c, DaemonIsLinux, NotUserNamespace)

 	out := dockerCmdWithFail(c, "run", "--net=host", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictContainerNetworkAndMac.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: mac-address and the network mode"))

 }

 func (s *DockerCLINetmodeSuite) TestConflictNetworkModeAndOptions(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	out := dockerCmdWithFail(c, "run", "--net=container:other", "--dns=8.8.8.8", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkAndDNS.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: dns and the network mode"))

 	out = dockerCmdWithFail(c, "run", "--net=container:other", "--add-host=name:8.8.8.8", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkHosts.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: custom host-to-IP mapping and the network mode"))

 	out = dockerCmdWithFail(c, "run", "--net=container:other", "-P", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: port publishing and the container type network mode"))

 	out = dockerCmdWithFail(c, "run", "--net=container:other", "-p", "8080", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: port publishing and the container type network mode"))

 	out = dockerCmdWithFail(c, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNetworkExposePorts.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: port exposing and the container type network mode"))

 }

@@ -26,7 +26,6 @@ import (

 	"github.com/docker/docker/internal/nlwrap"

 	"github.com/docker/docker/pkg/plugins"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/testutil"

 	testdaemon "github.com/docker/docker/testutil/daemon"

 	"github.com/vishvananda/netlink"

@@ -1155,7 +1154,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectToHostFromOtherNetwork(c *t

 	cli.DockerCmd(c, "network", "disconnect", "bridge", "container1")

 	out, _, err := dockerCmdWithError("network", "connect", "host", "container1")

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

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictConnectToHostNetwork.Error()))

+	assert.Assert(c, is.Contains(out, "cannot connect container to host network"))

 }

 func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *testing.T) {

@@ -1163,7 +1162,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *testing.T) {

 	cli.WaitRun(c, "container1")

 	out, _, err := dockerCmdWithError("network", "disconnect", "host", "container1")

 	assert.Assert(c, err != nil, "Should err out disconnect from host")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictDisconnectFromHostNetwork.Error()))

+	assert.Assert(c, is.Contains(out, "cannot disconnect container from host network"))

 }

 func (s *DockerNetworkSuite) TestDockerNetworkConnectWithPortMapping(c *testing.T) {

@@ -1324,7 +1323,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *testing.T) {

 	// Still it should fail to connect to the default network with a specified IP (whatever ip)

 	out, _, err := dockerCmdWithError("network", "connect", "--ip", "172.21.55.44", "bridge", "c0")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkAndIP.Error()))

+	assert.Assert(c, is.Contains(out, "user specified IP address is supported on user defined networks only"))

 }

 func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIPStoppedContainer(c *testing.T) {

@@ -1362,10 +1361,10 @@ func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *testing.T

 	out, _, err := dockerCmdWithError("run", "-d", "--ip", "172.28.99.88", "--net", "n0", "busybox", "top")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkNoSubnetAndIP.Error()))

+	assert.Assert(c, is.Contains(out, "user specified IP address is supported only when connecting to networks with user configured subnets"))

 	out, _, err = dockerCmdWithError("run", "-d", "--ip6", "2001:db8:1234::9988", "--net", "n0", "busybox", "top")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkNoSubnetAndIP.Error()))

+	assert.Assert(c, is.Contains(out, "user specified IP address is supported only when connecting to networks with user configured subnets"))

 	cli.DockerCmd(c, "network", "rm", "n0")

 	assertNwNotAvailable(c, "n0")

 }

@@ -1373,7 +1372,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *testing.T

 func checkUnsupportedNetworkAndIP(t *testing.T, nwMode string) {

 	out, _, err := dockerCmdWithError("run", "-d", "--net", nwMode, "--ip", "172.28.99.88", "--ip6", "2001:db8:1234::9988", "busybox", "top")

 	assert.Assert(t, err != nil, "out: %s", out)

-	assert.Assert(t, is.Contains(out, runconfig.ErrUnsupportedNetworkAndIP.Error()))

+	assert.Assert(t, is.Contains(out, "user specified IP address is supported on user defined networks only"))

 }

 func verifyIPAddressConfig(t *testing.T, cName, nwname, ipv4, ipv6 string) {

@@ -1512,7 +1511,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectWithAliasOnDefaultNetworks(

 	for _, nw := range defaults {

 		res, _, err := dockerCmdWithError("network", "connect", "--alias", "alias"+nw, nw, containerID)

 		assert.ErrorContains(c, err, "")

-		assert.Assert(c, is.Contains(res, runconfig.ErrUnsupportedNetworkAndAlias.Error()))

+		assert.Assert(c, is.Contains(res, "network-scoped alias is supported only for containers in user defined networks"))

 	}

 }

@@ -1563,11 +1562,11 @@ func (s *DockerCLINetworkSuite) TestUserDefinedNetworkConnectDisconnectAlias(c *

 	// verify the alias option is rejected when running on predefined network

 	out, _, err := dockerCmdWithError("run", "--rm", "--name=any", "--net-alias=any", "busybox:glibc", "true")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkAndAlias.Error()))

+	assert.Assert(c, is.Contains(out, "network-scoped alias is supported only for containers in user defined networks"))

 	// verify the alias option is rejected when connecting to predefined network

 	out, _, err = dockerCmdWithError("network", "connect", "--alias=any", "bridge", "first")

 	assert.Assert(c, err != nil, "out: %s", out)

-	assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkAndAlias.Error()))

+	assert.Assert(c, is.Contains(out, "network-scoped alias is supported only for containers in user defined networks"))

 }

 func (s *DockerCLINetworkSuite) TestUserDefinedNetworkConnectivity(c *testing.T) {

@@ -30,7 +30,6 @@ import (

 	"github.com/docker/docker/integration-cli/daemon"

 	"github.com/docker/docker/internal/testutils/specialimage"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/testutil"

 	testdaemon "github.com/docker/docker/testutil/daemon"

 	"github.com/docker/docker/testutil/fakecontext"

@@ -293,7 +292,7 @@ func (s *DockerCLIRunSuite) TestRunWithNetAliasOnDefaultNetworks(c *testing.T) {

 	for _, nw := range defaults {

 		out, _, err := dockerCmdWithError("run", "-d", "--net", nw, "--net-alias", "alias_"+nw, "busybox", "top")

 		assert.ErrorContains(c, err, "")

-		assert.Assert(c, is.Contains(out, runconfig.ErrUnsupportedNetworkAndAlias.Error()))

+		assert.Assert(c, is.Contains(out, "network-scoped alias is supported only for containers in user defined networks"))

 	}

 }

@@ -2429,7 +2428,7 @@ func (s *DockerCLIRunSuite) TestRunModeUTSHost(c *testing.T) {

 	}

 	out = dockerCmdWithFail(c, "run", "-h=name", "--uts=host", "busybox", "ps")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictUTSHostname.Error()))

+	assert.Assert(c, is.Contains(out, "conflicting options: hostname and the UTS mode"))

 }

 func (s *DockerCLIRunSuite) TestRunTLSVerify(c *testing.T) {

@@ -3297,12 +3296,12 @@ func (s *DockerCLIRunSuite) TestRunContainerNetModeWithDNSMacHosts(c *testing.T)

 	}

 	out, _, err = dockerCmdWithError("run", "--dns", "1.2.3.4", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkAndDNS.Error()) {

+	if err == nil || !strings.Contains(out, "conflicting options: dns and the network mode") {

 		c.Fatalf("run --net=container with --dns should error out")

 	}

 	out, _, err = dockerCmdWithError("run", "--add-host", "test:192.168.2.109", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkHosts.Error()) {

+	if err == nil || !strings.Contains(out, "conflicting options: custom host-to-IP mapping and the network mode") {

 		c.Fatalf("run --net=container with --add-host should error out")

 	}

 }

@@ -3313,17 +3312,17 @@ func (s *DockerCLIRunSuite) TestRunContainerNetModeWithExposePort(c *testing.T)

 	cli.DockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")

 	out, _, err := dockerCmdWithError("run", "-p", "5000:5000", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()) {

+	if err == nil || !strings.Contains(out, "conflicting options: port publishing and the container type network mode") {

 		c.Fatalf("run --net=container with -p should error out")

 	}

 	out, _, err = dockerCmdWithError("run", "-P", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()) {

+	if err == nil || !strings.Contains(out, "conflicting options: port publishing and the container type network mode") {

 		c.Fatalf("run --net=container with -P should error out")

 	}

 	out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkExposePorts.Error()) {

+	if err == nil || !strings.Contains(out, "conflicting options: port exposing and the container type network mode") {

 		c.Fatalf("run --net=container with --expose should error out")

 	}

 }

@@ -3538,7 +3537,7 @@ func (s *DockerCLIRunSuite) TestContainerWithConflictingSharedNetwork(c *testing

 	// Connecting to the user defined network must fail

 	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "second")

 	assert.ErrorContains(c, err, "")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictSharedNetwork.Error()))

+	assert.Assert(c, is.Contains(out, "container sharing network namespace with another container or host cannot be connected to any other network"))

 }

 func (s *DockerCLIRunSuite) TestContainerWithConflictingNoneNetwork(c *testing.T) {

@@ -3552,7 +3551,7 @@ func (s *DockerCLIRunSuite) TestContainerWithConflictingNoneNetwork(c *testing.T

 	// Connecting to the user defined network must fail

 	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "first")

 	assert.ErrorContains(c, err, "")

-	assert.Assert(c, is.Contains(out, runconfig.ErrConflictNoNetwork.Error()))

+	assert.Assert(c, is.Contains(out, "container cannot be connected to multiple networks with one of the networks in private (none) mode"))

 	// create a container connected to testnetwork1

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

 	cli.WaitRun(c, "second")