From 51cb066ec8f4ba961881cc09be14f87a1a4f7a5e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 30 Jan 2025 11:39:19 +0100 Subject: [PATCH] daemon: Daemon.rmLink: don't fuzzy-match container when using ID rmLink already looked up the parent container's ID, so we should not use daemon.GetContainer to resolve the container, as that performs fuzzy matching (name, ID-prefix, or ID). Signed-off-by: Sebastiaan van Stijn --- daemon/delete.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/daemon/delete.go b/daemon/delete.go index 9b351c09d1..513228a082 100644 --- a/daemon/delete.go +++ b/daemon/delete.go @@ -68,14 +68,13 @@ func (daemon *Daemon) rmLink(cfg *config.Config, container *container.Container, } parent = strings.TrimSuffix(parent, "/") - pe, err := daemon.containersReplica.Snapshot().GetID(parent) + parentID, err := daemon.containersReplica.Snapshot().GetID(parent) if err != nil { return fmt.Errorf("Cannot get parent %s for link name %s", parent, name) } daemon.releaseName(name) - parentContainer, _ := daemon.GetContainer(pe) - if parentContainer != nil { + if parentContainer := daemon.containers.Get(parentID); parentContainer != nil { daemon.linkIndex.unlink(name, container, parentContainer) if err := daemon.updateNetwork(cfg, parentContainer); err != nil { log.G(context.TODO()).Debugf("Could not update network to remove link %s: %v", n, err)