Browse code
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 <github@gone.nl>
Sebastiaan van Stijn authored on 2025/01/30 19:39:19Showing 1 changed files
| ... | ... |
@@ -68,14 +68,13 @@ func (daemon *Daemon) rmLink(cfg *config.Config, container *container.Container, |
| 68 | 68 |
} |
| 69 | 69 |
|
| 70 | 70 |
parent = strings.TrimSuffix(parent, "/") |
| 71 |
- pe, err := daemon.containersReplica.Snapshot().GetID(parent) |
|
| 71 |
+ parentID, err := daemon.containersReplica.Snapshot().GetID(parent) |
|
| 72 | 72 |
if err != nil {
|
| 73 | 73 |
return fmt.Errorf("Cannot get parent %s for link name %s", parent, name)
|
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 | 76 |
daemon.releaseName(name) |
| 77 |
- parentContainer, _ := daemon.GetContainer(pe) |
|
| 78 |
- if parentContainer != nil {
|
|
| 77 |
+ if parentContainer := daemon.containers.Get(parentID); parentContainer != nil {
|
|
| 79 | 78 |
daemon.linkIndex.unlink(name, container, parentContainer) |
| 80 | 79 |
if err := daemon.updateNetwork(cfg, parentContainer); err != nil {
|
| 81 | 80 |
log.G(context.TODO()).Debugf("Could not update network to remove link %s: %v", n, err)
|