From 5535e81a79f2875f4fcdbf71c2ac850d9868cabb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 29 Jul 2025 11:48:57 +0200 Subject: [PATCH] pkg/system: move to daemon/internal It has no external users, and this package still has too many different responsibilities, some of which may be available elsewhere, so moving it internal so that we can decide to dismantle it further. Signed-off-by: Sebastiaan van Stijn --- daemon/builder/dockerfile/copy.go | 2 +- daemon/builder/dockerfile/copy_windows.go | 2 +- daemon/container_operations_windows.go | 2 +- daemon/daemon_windows.go | 2 +- daemon/graphdriver/copy/copy.go | 2 +- daemon/graphdriver/copy/copy_test.go | 2 +- daemon/graphdriver/overlay2/check.go | 2 +- daemon/internal/image/tarexport/os_path.go | 2 +- daemon/internal/image/tarexport/save.go | 2 +- {pkg => daemon/internal}/system/chtimes.go | 0 {pkg => daemon/internal}/system/chtimes_linux_test.go | 0 {pkg => daemon/internal}/system/chtimes_nowindows.go | 0 {pkg => daemon/internal}/system/chtimes_test.go | 0 {pkg => daemon/internal}/system/chtimes_windows.go | 0 {pkg => daemon/internal}/system/chtimes_windows_test.go | 0 {pkg => daemon/internal}/system/filesys_windows.go | 0 {pkg => daemon/internal}/system/utimes_unix.go | 0 {pkg => daemon/internal}/system/utimes_unix_test.go | 0 {pkg => daemon/internal}/system/xattrs_linux.go | 0 19 files changed, 9 insertions(+), 9 deletions(-) rename {pkg => daemon/internal}/system/chtimes.go (100%) rename {pkg => daemon/internal}/system/chtimes_linux_test.go (100%) rename {pkg => daemon/internal}/system/chtimes_nowindows.go (100%) rename {pkg => daemon/internal}/system/chtimes_test.go (100%) rename {pkg => daemon/internal}/system/chtimes_windows.go (100%) rename {pkg => daemon/internal}/system/chtimes_windows_test.go (100%) rename {pkg => daemon/internal}/system/filesys_windows.go (100%) rename {pkg => daemon/internal}/system/utimes_unix.go (100%) rename {pkg => daemon/internal}/system/utimes_unix_test.go (100%) rename {pkg => daemon/internal}/system/xattrs_linux.go (100%) diff --git a/daemon/builder/dockerfile/copy.go b/daemon/builder/dockerfile/copy.go index c4789227f4..11b4545d5d 100644 --- a/daemon/builder/dockerfile/copy.go +++ b/daemon/builder/dockerfile/copy.go @@ -17,10 +17,10 @@ import ( "github.com/docker/docker/daemon/builder" "github.com/docker/docker/daemon/builder/remotecontext" "github.com/docker/docker/daemon/builder/remotecontext/urlutil" + "github.com/docker/docker/daemon/internal/system" "github.com/docker/docker/pkg/longpath" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" - "github.com/docker/docker/pkg/system" "github.com/moby/buildkit/frontend/dockerfile/instructions" "github.com/moby/go-archive" "github.com/moby/sys/symlink" diff --git a/daemon/builder/dockerfile/copy_windows.go b/daemon/builder/dockerfile/copy_windows.go index 6b89ffeae9..169bf8cf7c 100644 --- a/daemon/builder/dockerfile/copy_windows.go +++ b/daemon/builder/dockerfile/copy_windows.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/Microsoft/go-winio" - "github.com/docker/docker/pkg/system" + "github.com/docker/docker/daemon/internal/system" "github.com/moby/sys/reexec" "github.com/pkg/errors" "golang.org/x/sys/windows" diff --git a/daemon/container_operations_windows.go b/daemon/container_operations_windows.go index ba195f5808..99f765cd84 100644 --- a/daemon/container_operations_windows.go +++ b/daemon/container_operations_windows.go @@ -8,9 +8,9 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/container" + "github.com/docker/docker/daemon/internal/system" "github.com/docker/docker/daemon/libnetwork" "github.com/docker/docker/daemon/network" - "github.com/docker/docker/pkg/system" "github.com/pkg/errors" ) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 6cff894ce8..8639fb76ca 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -16,6 +16,7 @@ import ( "github.com/docker/docker/daemon/container" "github.com/docker/docker/daemon/internal/libcontainerd/local" "github.com/docker/docker/daemon/internal/libcontainerd/remote" + "github.com/docker/docker/daemon/internal/system" "github.com/docker/docker/daemon/libnetwork" nwconfig "github.com/docker/docker/daemon/libnetwork/config" winlibnetwork "github.com/docker/docker/daemon/libnetwork/drivers/windows" @@ -25,7 +26,6 @@ import ( "github.com/docker/docker/daemon/network" "github.com/docker/docker/pkg/parsers/operatingsystem" "github.com/docker/docker/pkg/sysinfo" - "github.com/docker/docker/pkg/system" containertypes "github.com/moby/moby/api/types/container" networktypes "github.com/moby/moby/api/types/network" "github.com/moby/sys/user" diff --git a/daemon/graphdriver/copy/copy.go b/daemon/graphdriver/copy/copy.go index a6c89cf204..8700955c63 100644 --- a/daemon/graphdriver/copy/copy.go +++ b/daemon/graphdriver/copy/copy.go @@ -12,8 +12,8 @@ import ( "syscall" "time" + "github.com/docker/docker/daemon/internal/system" "github.com/docker/docker/pkg/pools" - "github.com/docker/docker/pkg/system" "github.com/moby/sys/userns" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/copy/copy_test.go b/daemon/graphdriver/copy/copy_test.go index f83a0887f1..279e0442e9 100644 --- a/daemon/graphdriver/copy/copy_test.go +++ b/daemon/graphdriver/copy/copy_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/docker/docker/pkg/system" + "github.com/docker/docker/daemon/internal/system" "golang.org/x/sys/unix" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/graphdriver/overlay2/check.go b/daemon/graphdriver/overlay2/check.go index d9fd65ddd8..1444e4e223 100644 --- a/daemon/graphdriver/overlay2/check.go +++ b/daemon/graphdriver/overlay2/check.go @@ -11,7 +11,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/docker/docker/daemon/graphdriver/overlayutils" - "github.com/docker/docker/pkg/system" + "github.com/docker/docker/daemon/internal/system" "github.com/moby/sys/userns" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/daemon/internal/image/tarexport/os_path.go b/daemon/internal/image/tarexport/os_path.go index 4b289034a4..9817833c95 100644 --- a/daemon/internal/image/tarexport/os_path.go +++ b/daemon/internal/image/tarexport/os_path.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "github.com/docker/docker/pkg/system" + "github.com/docker/docker/daemon/internal/system" ) // mkdirAllWithChtimes is nearly an identical copy to the [os.MkdirAll] but diff --git a/daemon/internal/image/tarexport/save.go b/daemon/internal/image/tarexport/save.go index 1412138c40..c17bc6b4ba 100644 --- a/daemon/internal/image/tarexport/save.go +++ b/daemon/internal/image/tarexport/save.go @@ -20,7 +20,7 @@ import ( v1 "github.com/docker/docker/daemon/internal/image/v1" "github.com/docker/docker/daemon/internal/ioutils" "github.com/docker/docker/daemon/internal/layer" - "github.com/docker/docker/pkg/system" + "github.com/docker/docker/daemon/internal/system" "github.com/moby/go-archive" "github.com/moby/moby/api/types/events" "github.com/moby/sys/sequential" diff --git a/pkg/system/chtimes.go b/daemon/internal/system/chtimes.go similarity index 100% rename from pkg/system/chtimes.go rename to daemon/internal/system/chtimes.go diff --git a/pkg/system/chtimes_linux_test.go b/daemon/internal/system/chtimes_linux_test.go similarity index 100% rename from pkg/system/chtimes_linux_test.go rename to daemon/internal/system/chtimes_linux_test.go diff --git a/pkg/system/chtimes_nowindows.go b/daemon/internal/system/chtimes_nowindows.go similarity index 100% rename from pkg/system/chtimes_nowindows.go rename to daemon/internal/system/chtimes_nowindows.go diff --git a/pkg/system/chtimes_test.go b/daemon/internal/system/chtimes_test.go similarity index 100% rename from pkg/system/chtimes_test.go rename to daemon/internal/system/chtimes_test.go diff --git a/pkg/system/chtimes_windows.go b/daemon/internal/system/chtimes_windows.go similarity index 100% rename from pkg/system/chtimes_windows.go rename to daemon/internal/system/chtimes_windows.go diff --git a/pkg/system/chtimes_windows_test.go b/daemon/internal/system/chtimes_windows_test.go similarity index 100% rename from pkg/system/chtimes_windows_test.go rename to daemon/internal/system/chtimes_windows_test.go diff --git a/pkg/system/filesys_windows.go b/daemon/internal/system/filesys_windows.go similarity index 100% rename from pkg/system/filesys_windows.go rename to daemon/internal/system/filesys_windows.go diff --git a/pkg/system/utimes_unix.go b/daemon/internal/system/utimes_unix.go similarity index 100% rename from pkg/system/utimes_unix.go rename to daemon/internal/system/utimes_unix.go diff --git a/pkg/system/utimes_unix_test.go b/daemon/internal/system/utimes_unix_test.go similarity index 100% rename from pkg/system/utimes_unix_test.go rename to daemon/internal/system/utimes_unix_test.go diff --git a/pkg/system/xattrs_linux.go b/daemon/internal/system/xattrs_linux.go similarity index 100% rename from pkg/system/xattrs_linux.go rename to daemon/internal/system/xattrs_linux.go