mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-29 07:21:35 +03:00
Code Activity

runconfig/errors: split ErrConflictHostNetwork

Browse Source 
Split the `ErrConflictHostNetwork` error into two distinct errors:

1. `ErrConflictConnectToHostNetwork` when attempting to change the
   network mode of a running container from a different mode to `host`
2. `ErrConflictDisconnectFromHostNetwork` when the network mode of a
   running container is `host` and attempting to disconnect from `host`

This commit clarifies error messaging by differentiating between the two
errors, making it clearer which operation failed and how to fix it.

Signed-off-by: Brendon Smith <bws@bws.bio>
This commit is contained in:
Brendon Smith
2025-03-08 17:13:20 -05:00
parent b4bdf12dae
commit 90a83063ee
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/container_operations.go
View File

@ -173,7 +173,7 @@ func (daemon *Daemon) updateNetworkSettings(ctr *container.Container, n *libnetw
} }
if !ctr.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() { if !ctr.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() {
return runconfig.ErrConflictHostNetwork return runconfig.ErrConflictConnectToHostNetwork
} }
for s, v := range ctr.NetworkSettings.Networks { for s, v := range ctr.NetworkSettings.Networks {
@ -1053,7 +1053,7 @@ func (daemon *Daemon) DisconnectFromNetwork(ctx context.Context, ctr *container.
delete(ctr.NetworkSettings.Networks, networkName) delete(ctr.NetworkSettings.Networks, networkName)
} else if err == nil { } else if err == nil {
if ctr.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() { if ctr.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() {
return runconfig.ErrConflictHostNetwork return runconfig.ErrConflictDisconnectFromHostNetwork
} }
if err := daemon.disconnectFromNetwork(ctx, ctr, n, false); err != nil { if err := daemon.disconnectFromNetwork(ctx, ctr, n, false); err != nil {

4
integration-cli/docker_cli_network_unix_test.go
View File

@ -1155,7 +1155,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectToHostFromOtherNetwork(c *t
cli.DockerCmd(c, "network", "disconnect", "bridge", "container1") cli.DockerCmd(c, "network", "disconnect", "bridge", "container1")
out, _, err := dockerCmdWithError("network", "connect", "host", "container1") out, _, err := dockerCmdWithError("network", "connect", "host", "container1")
assert.ErrorContains(c, err, "", out) assert.ErrorContains(c, err, "", out)
assert.Assert(c, is.Contains(out, runconfig.ErrConflictHostNetwork.Error())) assert.Assert(c, is.Contains(out, runconfig.ErrConflictConnectToHostNetwork.Error()))
} }
func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *testing.T) { func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *testing.T) {
@ -1163,7 +1163,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *testing.T) {
cli.WaitRun(c, "container1") cli.WaitRun(c, "container1")
out, _, err := dockerCmdWithError("network", "disconnect", "host", "container1") out, _, err := dockerCmdWithError("network", "disconnect", "host", "container1")
assert.Assert(c, err != nil, "Should err out disconnect from host") assert.Assert(c, err != nil, "Should err out disconnect from host")
assert.Assert(c, is.Contains(out, runconfig.ErrConflictHostNetwork.Error())) assert.Assert(c, is.Contains(out, runconfig.ErrConflictDisconnectFromHostNetwork.Error()))
} }
func (s *DockerNetworkSuite) TestDockerNetworkConnectWithPortMapping(c *testing.T) { func (s *DockerNetworkSuite) TestDockerNetworkConnectWithPortMapping(c *testing.T) {

6
runconfig/errors.go
View File

@ -5,8 +5,10 @@ const (
ErrConflictContainerNetworkAndLinks validationError = "conflicting options: container type network can't be used with links. This would result in undefined behavior" ErrConflictContainerNetworkAndLinks validationError = "conflicting options: container type network can't be used with links. This would result in undefined behavior"
// ErrConflictSharedNetwork conflict between private and other networks // ErrConflictSharedNetwork conflict between private and other networks
ErrConflictSharedNetwork validationError = "container sharing network namespace with another container or host cannot be connected to any other network" ErrConflictSharedNetwork validationError = "container sharing network namespace with another container or host cannot be connected to any other network"
// ErrConflictHostNetwork conflict from being disconnected from host network or connected to host network. // ErrConflictConnectToHostNetwork error when attempting to connect a container to host network when not in host network mode
ErrConflictHostNetwork validationError = "container cannot be disconnected from host network or connected to host network" ErrConflictConnectToHostNetwork validationError = "cannot connect container to host network - container must be created in host network mode"
// ErrConflictDisconnectFromHostNetwork error when attempting to disconnect a container from host network when in host network mode
ErrConflictDisconnectFromHostNetwork validationError = "cannot disconnect container from host network - container was created in host network mode"
// ErrConflictNoNetwork conflict between private and other networks // ErrConflictNoNetwork conflict between private and other networks
ErrConflictNoNetwork validationError = "container cannot be connected to multiple networks with one of the networks in private (none) mode" ErrConflictNoNetwork validationError = "container cannot be connected to multiple networks with one of the networks in private (none) mode"
// ErrConflictNetworkAndDNS conflict between --dns and the network mode // ErrConflictNetworkAndDNS conflict between --dns and the network mode