From ca9c4dffb70a4965cd703ecea06a2074a711e6bc Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 24 Jul 2025 12:12:54 -0700 Subject: [PATCH] Move internal/cleanups to daemon/internal/cleanups Signed-off-by: Derek McGowan --- {internal => daemon/internal}/cleanups/composite.go | 0 {internal => daemon/internal}/cleanups/composite_test.go | 0 daemon/libnetwork/drivers/bridge/internal/nftabler/network.go | 2 +- daemon/volume/safepath/join_windows.go | 2 +- daemon/volumes_unix.go | 2 +- daemon/volumes_windows.go | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename {internal => daemon/internal}/cleanups/composite.go (100%) rename {internal => daemon/internal}/cleanups/composite_test.go (100%) diff --git a/internal/cleanups/composite.go b/daemon/internal/cleanups/composite.go similarity index 100% rename from internal/cleanups/composite.go rename to daemon/internal/cleanups/composite.go diff --git a/internal/cleanups/composite_test.go b/daemon/internal/cleanups/composite_test.go similarity index 100% rename from internal/cleanups/composite_test.go rename to daemon/internal/cleanups/composite_test.go diff --git a/daemon/libnetwork/drivers/bridge/internal/nftabler/network.go b/daemon/libnetwork/drivers/bridge/internal/nftabler/network.go index 0e9b55f2c0..63265d095c 100644 --- a/daemon/libnetwork/drivers/bridge/internal/nftabler/network.go +++ b/daemon/libnetwork/drivers/bridge/internal/nftabler/network.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/cleanups" "github.com/docker/docker/daemon/libnetwork/drivers/bridge/internal/firewaller" "github.com/docker/docker/daemon/libnetwork/internal/nftables" - "github.com/docker/docker/internal/cleanups" "go.opentelemetry.io/otel" ) diff --git a/daemon/volume/safepath/join_windows.go b/daemon/volume/safepath/join_windows.go index 5acfc22ec8..3e11599038 100644 --- a/daemon/volume/safepath/join_windows.go +++ b/daemon/volume/safepath/join_windows.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containerd/log" - "github.com/docker/docker/internal/cleanups" + "github.com/docker/docker/daemon/internal/cleanups" "github.com/pkg/errors" "golang.org/x/sys/windows" ) diff --git a/daemon/volumes_unix.go b/daemon/volumes_unix.go index 1f293c58c4..b7f3b4091b 100644 --- a/daemon/volumes_unix.go +++ b/daemon/volumes_unix.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/cleanups" "github.com/docker/docker/daemon/internal/idtools" volumemounts "github.com/docker/docker/daemon/volume/mounts" - "github.com/docker/docker/internal/cleanups" "github.com/moby/moby/api/types/events" mounttypes "github.com/moby/moby/api/types/mount" "github.com/pkg/errors" diff --git a/daemon/volumes_windows.go b/daemon/volumes_windows.go index b47c520f3c..da939e9775 100644 --- a/daemon/volumes_windows.go +++ b/daemon/volumes_windows.go @@ -5,9 +5,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/cleanups" "github.com/docker/docker/daemon/internal/idtools" volumemounts "github.com/docker/docker/daemon/volume/mounts" - "github.com/docker/docker/internal/cleanups" "github.com/moby/moby/api/types/mount" )