From d44a48835fc358a35f3b35290a53bebbdefdc0d8 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 2 May 2019 22:00:34 -0700 Subject: [PATCH] Change Forbidden Error (403) to Conflict(409) Signed-off-by: Arko Dasgupta (cherry picked from commit 31e8fcc67808488e9aade681a831d748df1af8a5) Signed-off-by: Sebastiaan van Stijn --- daemon/container_operations.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/container_operations.go b/daemon/container_operations.go index a1b18aa7ff..76cdaac96a 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -359,7 +359,8 @@ func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrN networkName := n.Name() containerName := strings.TrimPrefix(container.Name, "/") 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) } } }