Move internal/multierror to daemon/internal/multierror

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2025-07-24 12:13:42 -07:00
parent baea1c5092
commit fd21e3b935
7 changed files with 5 additions and 5 deletions

View File

@@ -18,6 +18,7 @@ import (
"github.com/docker/docker/daemon/config"
"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/libnetwork"
"github.com/docker/docker/daemon/libnetwork/netlabel"
"github.com/docker/docker/daemon/libnetwork/scope"
@@ -25,7 +26,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/multierror"
"github.com/docker/docker/internal/sliceutil"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/runconfig"

View File

@@ -13,8 +13,8 @@ import (
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/daemon/internal/image/cache"
"github.com/docker/docker/daemon/internal/layer"
"github.com/docker/docker/daemon/internal/multierror"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/internal/multierror"
"github.com/moby/moby/api/types/backend"
"github.com/moby/moby/api/types/container"
"github.com/opencontainers/go-digest"

View File

@@ -19,8 +19,8 @@ import (
"github.com/docker/docker/daemon/images"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/daemon/internal/metrics"
"github.com/docker/docker/daemon/internal/multierror"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/internal/multierror"
"github.com/docker/docker/internal/otelutil"
"github.com/docker/docker/runconfig"
"github.com/moby/moby/api/types/backend"

View File

@@ -3,7 +3,7 @@ package cleanups
import (
"context"
"github.com/docker/docker/internal/multierror"
"github.com/docker/docker/daemon/internal/multierror"
)
type Composite struct {

View File

@@ -9,7 +9,7 @@ import (
"github.com/containerd/platforms"
"github.com/docker/docker/daemon/container"
"github.com/docker/docker/daemon/internal/image"
"github.com/docker/docker/internal/multierror"
"github.com/docker/docker/daemon/internal/multierror"
"github.com/moby/moby/api/types/backend"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"