fix: fix clean network

This commit is contained in:
guoyuqi
2026-10-08 17:44:29 +08:00
parent a917880cac
commit 4ea3f7e4b8
4 changed files with 3 additions and 11 deletions
@@ -1,6 +1,5 @@
package dto
// NetworkCleanupReport records partial success; failed entries were not deleted.
type NetworkCleanupReport struct {
Deleted []NetworkCleanupItem `json:"deleted"`
Skipped []NetworkCleanupItem `json:"skipped"`
@@ -13,7 +12,6 @@ type NetworkCleanupItem struct {
Reason string `json:"reason,omitempty"`
}
// NetworkCleanupTask identifies an asynchronous task and its log.
type NetworkCleanupTask struct {
TaskID string `json:"taskID"`
}
@@ -13,7 +13,6 @@ import (
var networkCleanupMu sync.Mutex
// CleanNetworks submits a task independent of the HTTP request lifetime.
func (u *ContainerService) CleanNetworks() (*dto.NetworkCleanupTask, error) {
taskItem, err := task.NewTaskWithOps(i18n.GetMsgByKey("Network"), task.TaskClean, task.TaskScopeContainer, "", 0)
if err != nil {
-3
View File
@@ -10,7 +10,6 @@ import (
"github.com/docker/docker/errdefs"
)
// NetworkCleanupClient deliberately exposes no disconnect or force operation.
type NetworkCleanupClient interface {
NetworkList(context.Context, network.ListOptions) ([]network.Inspect, error)
ContainerList(context.Context, container.ListOptions) ([]container.Summary, error)
@@ -18,8 +17,6 @@ type NetworkCleanupClient interface {
NetworkRemove(context.Context, string) error
}
// CleanUnusedNetworks lists networks and all containers before deleting anything.
// Docker remains the final arbiter for connections racing this scan.
func CleanUnusedNetworks(ctx context.Context, cli NetworkCleanupClient, onResult ...func(string, dto.NetworkCleanupItem)) (*dto.NetworkCleanupReport, error) {
networks, err := cli.NetworkList(ctx, network.ListOptions{})
if err != nil {
+3 -5
View File
@@ -2939,9 +2939,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "26.6.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.3.tgz",
"integrity": "sha512-dsqMQQoeTLqu9wynDD00q573mNzso3IdQOAfHRJqLCcmCFPoGo9A1bDpUcv/9tnKpErQWv9uKeGfl37EIS02Yg==",
"version": "26.4.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.4.0.tgz",
"integrity": "sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==",
"devOptional": true,
"license": "MIT",
"dependencies": {
@@ -7002,7 +7002,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
"dev": true,
"license": "MIT",
"bin": {
"jsesc": "bin/jsesc"
@@ -7050,7 +7049,6 @@
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
"dev": true,
"license": "MIT",
"bin": {
"json5": "lib/cli.js"