beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change Forbidden Error (403) to Conflict(409)

Browse source 
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit 31e8fcc678)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Arko Dasgupta 2019-05-02 22:00:34 -07:00 committed by Sebastiaan van Stijn
parent 275bf7ec03
commit d44a48835f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/container_operations.go
View file

@ -359,7 +359,8 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN
networkName := n.Name() networkName := n.Name()
containerName := strings.TrimPrefix(container.Name, "/") containerName := strings.TrimPrefix(container.Name, "/")
if network, ok := container.NetworkSettings.Networks[networkName]; ok && network.EndpointID != "" { if network, ok := container.NetworkSettings.Networks[networkName]; ok && network.EndpointID != "" {
return n, nil, types.ForbiddenErrorf("%s is already attached to network %s", containerName, networkName) err := fmt.Errorf("%s is already attached to network %s", containerName, networkName)
return n, nil, errdefs.Conflict(err)
} }
} }
} }