From 78820a63d647276cf17dac9ac71ed2beb19f285d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 13 Jan 2015 21:57:48 +0100 Subject: [PATCH] Mention "or rename" again in error-message. The "or rename" part was removed from the error-message, because renaming wasn't possible at the time. Now that https://github.com/docker/docker/pull/8570 is merged, renaming existing containers is possible. Signed-off-by: Sebastiaan van Stijn --- daemon/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index c0217eef56..c9fc2f4acf 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -542,7 +542,7 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) { } else { nameAsKnownByUser := strings.TrimPrefix(name, "/") return "", fmt.Errorf( - "Conflict. The name %q is already in use by container %s. You have to delete that container to be able to reuse that name.", nameAsKnownByUser, + "Conflict. The name %q is already in use by container %s. You have to delete (or rename) that container to be able to reuse that name.", nameAsKnownByUser, utils.TruncateID(conflictingContainer.ID)) } }