Преглед на файлове

Better error message for network connect

Use better error message when user want to connect container with same
name to one network, this can help avoid confusion.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Zhang Wei преди 9 години
родител
ревизия
8edb941b79
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      daemon/container_operations_unix.go

+ 1 - 1
daemon/container_operations_unix.go

@@ -616,7 +616,7 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
 
 	ep, err := container.GetEndpointInNetwork(n)
 	if err == nil {
-		return fmt.Errorf("container already connected to network %s", idOrName)
+		return fmt.Errorf("Conflict. A container with name %q is already connected to network %s.", strings.TrimPrefix(container.Name, "/"), idOrName)
 	}
 
 	if _, ok := err.(libnetwork.ErrNoSuchEndpoint); !ok {