diff --git a/daemon/container_operations.go b/daemon/container_operations.go index 9374983f87..4c83b3dda3 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -19,6 +19,7 @@ import ( "github.com/docker/docker/daemon/container" "github.com/docker/docker/daemon/internal/metrics" "github.com/docker/docker/daemon/internal/multierror" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork" "github.com/docker/docker/daemon/libnetwork/netlabel" "github.com/docker/docker/daemon/libnetwork/scope" @@ -26,7 +27,6 @@ import ( "github.com/docker/docker/daemon/network" "github.com/docker/docker/daemon/pkg/opts" "github.com/docker/docker/errdefs" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/runconfig" "github.com/docker/go-connections/nat" diff --git a/daemon/containerd/image_inspect.go b/daemon/containerd/image_inspect.go index 5ce415061e..40fde7dccd 100644 --- a/daemon/containerd/image_inspect.go +++ b/daemon/containerd/image_inspect.go @@ -13,7 +13,7 @@ import ( "github.com/containerd/log" "github.com/containerd/platforms" "github.com/distribution/reference" - "github.com/docker/docker/internal/sliceutil" + "github.com/docker/docker/daemon/internal/sliceutil" imagespec "github.com/moby/docker-image-spec/specs-go/v1" "github.com/moby/moby/api/types/backend" imagetypes "github.com/moby/moby/api/types/image" diff --git a/internal/sliceutil/sliceutil.go b/daemon/internal/sliceutil/sliceutil.go similarity index 100% rename from internal/sliceutil/sliceutil.go rename to daemon/internal/sliceutil/sliceutil.go diff --git a/internal/sliceutil/sliceutil_test.go b/daemon/internal/sliceutil/sliceutil_test.go similarity index 95% rename from internal/sliceutil/sliceutil_test.go rename to daemon/internal/sliceutil/sliceutil_test.go index ab14194798..06008a1b6e 100644 --- a/internal/sliceutil/sliceutil_test.go +++ b/daemon/internal/sliceutil/sliceutil_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/docker/docker/internal/sliceutil" + "github.com/docker/docker/daemon/internal/sliceutil" ) func TestMap(t *testing.T) { diff --git a/daemon/libnetwork/drivers/bridge/bridge_linux.go b/daemon/libnetwork/drivers/bridge/bridge_linux.go index 9ffb146f49..5384c9cd51 100644 --- a/daemon/libnetwork/drivers/bridge/bridge_linux.go +++ b/daemon/libnetwork/drivers/bridge/bridge_linux.go @@ -17,6 +17,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/daemon/internal/otelutil" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/datastore" "github.com/docker/docker/daemon/libnetwork/driverapi" "github.com/docker/docker/daemon/libnetwork/drivers/bridge/internal/firewaller" @@ -35,7 +36,6 @@ import ( "github.com/docker/docker/daemon/libnetwork/scope" "github.com/docker/docker/daemon/libnetwork/types" "github.com/docker/docker/errdefs" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" "github.com/pkg/errors" "github.com/vishvananda/netlink" diff --git a/daemon/libnetwork/drivers/bridge/port_mapping_linux.go b/daemon/libnetwork/drivers/bridge/port_mapping_linux.go index 00a8e4195b..6564e0549d 100644 --- a/daemon/libnetwork/drivers/bridge/port_mapping_linux.go +++ b/daemon/libnetwork/drivers/bridge/port_mapping_linux.go @@ -11,10 +11,10 @@ import ( "slices" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/netutils" "github.com/docker/docker/daemon/libnetwork/portmapperapi" "github.com/docker/docker/daemon/libnetwork/types" - "github.com/docker/docker/internal/sliceutil" ) // addPortMappings takes cfg, the configuration for port mappings, selects host diff --git a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go index 7e8f969438..cec1b25415 100644 --- a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go +++ b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go @@ -17,6 +17,7 @@ import ( "testing" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/drivers/bridge/internal/firewaller" "github.com/docker/docker/daemon/libnetwork/drvregistry" "github.com/docker/docker/daemon/libnetwork/netlabel" @@ -26,7 +27,6 @@ import ( "github.com/docker/docker/daemon/libnetwork/portmappers/nat" "github.com/docker/docker/daemon/libnetwork/portmappers/routed" "github.com/docker/docker/daemon/libnetwork/types" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/internal/testutils/netnsutils" "github.com/docker/docker/internal/testutils/storeutils" "github.com/sirupsen/logrus" diff --git a/daemon/libnetwork/endpoint.go b/daemon/libnetwork/endpoint.go index 706469219f..79f7046dfb 100644 --- a/daemon/libnetwork/endpoint.go +++ b/daemon/libnetwork/endpoint.go @@ -14,6 +14,7 @@ import ( "sync" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/datastore" "github.com/docker/docker/daemon/libnetwork/driverapi" "github.com/docker/docker/daemon/libnetwork/ipamapi" @@ -22,7 +23,6 @@ import ( "github.com/docker/docker/daemon/libnetwork/scope" "github.com/docker/docker/daemon/libnetwork/types" "github.com/docker/docker/errdefs" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" "go.opentelemetry.io/otel" ) diff --git a/daemon/libnetwork/internal/resolvconf/resolvconf_test.go b/daemon/libnetwork/internal/resolvconf/resolvconf_test.go index ac26d3287e..9938b5d0fc 100644 --- a/daemon/libnetwork/internal/resolvconf/resolvconf_test.go +++ b/daemon/libnetwork/internal/resolvconf/resolvconf_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/docker/docker/internal/sliceutil" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/google/go-cmp/cmp/cmpopts" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" diff --git a/daemon/libnetwork/network.go b/daemon/libnetwork/network.go index 8bc8e191b6..3d237dc8e7 100644 --- a/daemon/libnetwork/network.go +++ b/daemon/libnetwork/network.go @@ -16,6 +16,7 @@ import ( "time" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/datastore" "github.com/docker/docker/daemon/libnetwork/driverapi" "github.com/docker/docker/daemon/libnetwork/internal/netiputil" @@ -29,7 +30,6 @@ import ( "github.com/docker/docker/daemon/libnetwork/scope" "github.com/docker/docker/daemon/libnetwork/types" "github.com/docker/docker/errdefs" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/daemon/libnetwork/osl/interface_linux_test.go b/daemon/libnetwork/osl/interface_linux_test.go index 2935ba3ee4..34aab94dbe 100644 --- a/daemon/libnetwork/osl/interface_linux_test.go +++ b/daemon/libnetwork/osl/interface_linux_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/nlwrap" - "github.com/docker/docker/internal/sliceutil" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" "gotest.tools/v3/assert" diff --git a/daemon/libnetwork/portmappers/routed/mapper_linux.go b/daemon/libnetwork/portmappers/routed/mapper_linux.go index cbf691744e..ffa90c0338 100644 --- a/daemon/libnetwork/portmappers/routed/mapper_linux.go +++ b/daemon/libnetwork/portmappers/routed/mapper_linux.go @@ -7,9 +7,9 @@ import ( "context" "github.com/containerd/log" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/libnetwork/portmapperapi" "github.com/docker/docker/daemon/libnetwork/types" - "github.com/docker/docker/internal/sliceutil" ) const driverName = "routed" diff --git a/daemon/pkg/plugin/v2/plugin_linux.go b/daemon/pkg/plugin/v2/plugin_linux.go index 7ea2579e23..f47b7598ba 100644 --- a/daemon/pkg/plugin/v2/plugin_linux.go +++ b/daemon/pkg/plugin/v2/plugin_linux.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/docker/docker/daemon/internal/rootless/mountopts" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/pkg/oci" - "github.com/docker/docker/internal/sliceutil" "github.com/moby/moby/api/types" "github.com/moby/sys/userns" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/daemon/server/router/container/inspect.go b/daemon/server/router/container/inspect.go index b0bf8e1b5e..e9a6117515 100644 --- a/daemon/server/router/container/inspect.go +++ b/daemon/server/router/container/inspect.go @@ -7,8 +7,8 @@ import ( "context" "net/http" + "github.com/docker/docker/daemon/internal/sliceutil" "github.com/docker/docker/daemon/server/httputils" - "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/pkg/stringid" "github.com/moby/moby/api/types/backend" "github.com/moby/moby/api/types/container"