From 4e8bd050bf5d7f50808ca648d6dc8b7e19c1879d Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 27 Jun 2025 14:28:08 -0700 Subject: [PATCH] Move libcontainerd/remote to daemon/internal/libcontainerd/remote Signed-off-by: Derek McGowan --- daemon/daemon_unix.go | 2 +- daemon/daemon_windows.go | 2 +- .../internal/libcontainerd}/remote/client.go | 0 .../internal/libcontainerd}/remote/client_io_windows.go | 0 .../internal/libcontainerd}/remote/client_linux.go | 0 .../internal/libcontainerd}/remote/client_windows.go | 0 libcontainerd/libcontainerd_linux.go | 2 +- libcontainerd/libcontainerd_windows.go | 2 +- 8 files changed, 4 insertions(+), 4 deletions(-) rename {libcontainerd => daemon/internal/libcontainerd}/remote/client.go (100%) rename {libcontainerd => daemon/internal/libcontainerd}/remote/client_io_windows.go (100%) rename {libcontainerd => daemon/internal/libcontainerd}/remote/client_linux.go (100%) rename {libcontainerd => daemon/internal/libcontainerd}/remote/client_windows.go (100%) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 2acb06f5c2..9c38f9cc7a 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -29,11 +29,11 @@ import ( "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/container" "github.com/docker/docker/daemon/initlayer" + "github.com/docker/docker/daemon/internal/libcontainerd/remote" "github.com/docker/docker/errdefs" "github.com/docker/docker/internal/nlwrap" "github.com/docker/docker/internal/otelutil" "github.com/docker/docker/internal/usergroup" - "github.com/docker/docker/libcontainerd/remote" "github.com/docker/docker/libnetwork" nwconfig "github.com/docker/docker/libnetwork/config" "github.com/docker/docker/libnetwork/drivers/bridge" diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index c8222a6ee2..3d321d2036 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -17,8 +17,8 @@ import ( "github.com/docker/docker/daemon/config" "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/network" - "github.com/docker/docker/libcontainerd/remote" "github.com/docker/docker/libnetwork" nwconfig "github.com/docker/docker/libnetwork/config" winlibnetwork "github.com/docker/docker/libnetwork/drivers/windows" diff --git a/libcontainerd/remote/client.go b/daemon/internal/libcontainerd/remote/client.go similarity index 100% rename from libcontainerd/remote/client.go rename to daemon/internal/libcontainerd/remote/client.go diff --git a/libcontainerd/remote/client_io_windows.go b/daemon/internal/libcontainerd/remote/client_io_windows.go similarity index 100% rename from libcontainerd/remote/client_io_windows.go rename to daemon/internal/libcontainerd/remote/client_io_windows.go diff --git a/libcontainerd/remote/client_linux.go b/daemon/internal/libcontainerd/remote/client_linux.go similarity index 100% rename from libcontainerd/remote/client_linux.go rename to daemon/internal/libcontainerd/remote/client_linux.go diff --git a/libcontainerd/remote/client_windows.go b/daemon/internal/libcontainerd/remote/client_windows.go similarity index 100% rename from libcontainerd/remote/client_windows.go rename to daemon/internal/libcontainerd/remote/client_windows.go diff --git a/libcontainerd/libcontainerd_linux.go b/libcontainerd/libcontainerd_linux.go index 6279caf9f0..671d7576ef 100644 --- a/libcontainerd/libcontainerd_linux.go +++ b/libcontainerd/libcontainerd_linux.go @@ -4,7 +4,7 @@ import ( "context" containerd "github.com/containerd/containerd/v2/client" - "github.com/docker/docker/libcontainerd/remote" + "github.com/docker/docker/daemon/internal/libcontainerd/remote" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" ) diff --git a/libcontainerd/libcontainerd_windows.go b/libcontainerd/libcontainerd_windows.go index 0f063355fe..49187069b6 100644 --- a/libcontainerd/libcontainerd_windows.go +++ b/libcontainerd/libcontainerd_windows.go @@ -5,7 +5,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/docker/docker/daemon/internal/libcontainerd/local" - "github.com/docker/docker/libcontainerd/remote" + "github.com/docker/docker/daemon/internal/libcontainerd/remote" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/system" )