Merge pull request containerd#3880 from Shubhranshu153/fix-network-cleanup

AkihiroSuda · web-flow · commit 369e7e7257b6 · 2025-02-15T17:28:00.000+09:00
fix: network cleanup called twice
diff --git a/cmd/nerdctl/container/container_run.go b/cmd/nerdctl/container/container_run.go
@@ -385,9 +385,6 @@ func runAction(cmd *cobra.Command, args []string) error {
 			if isDetached {
 				return
 			}
-			if err := netManager.CleanupNetworking(ctx, c); err != nil {
-				log.L.WithError(err).Warnf("failed to clean up container networking")
-			}
 			if err := container.RemoveContainer(ctx, c, createOpt.GOptions, true, true, client); err != nil {
 				log.L.WithError(err).Warnf("failed to remove container %s", id)
 			}

Original file line number	Diff line number	Diff line change
`@@ -385,9 +385,6 @@ func runAction(cmd *cobra.Command, args []string) error {`
`385`	`385`	`if isDetached {`
`386`	`386`	`return`
`387`	`387`	`}`
`388`		`- if err := netManager.CleanupNetworking(ctx, c); err != nil {`
`389`		`- log.L.WithError(err).Warnf("failed to clean up container networking")`
`390`		`- }`
`391`	`388`	`if err := container.RemoveContainer(ctx, c, createOpt.GOptions, true, true, client); err != nil {`
`392`	`389`	`log.L.WithError(err).Warnf("failed to remove container %s", id)`
`393`	`390`	`}`