beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

migrate to github.com/containerd/log v0.1.0

Browse source 
The github.com/containerd/containerd/log package was moved to a separate
module, which will also be used by upcoming (patch) releases of containerd.

This patch moves our own uses of the package to use the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-09-13 17:41:45 +02:00
parent d7caea206e
commit cff4f20c44
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
330 changed files with 336 additions and 340 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/httpstatus/status.go
View file

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/distribution/registry/api/errcode" "github.com/docker/distribution/registry/api/errcode"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

2
api/server/middleware.go
View file

@ -1,7 +1,7 @@
package server // import "github.com/docker/docker/api/server" package server // import "github.com/docker/docker/api/server"
import ( import (
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/middleware" "github.com/docker/docker/api/server/middleware"
) )

2
api/server/middleware/cors.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"
) )

2
api/server/middleware/debug.go
View file

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
) )

2
api/server/router/build/build_routes.go
View file

@ -14,7 +14,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"

2
api/server/router/container/container_routes.go
View file

@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/docker/docker/api/server/httpstatus" "github.com/docker/docker/api/server/httpstatus"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"

2
api/server/router/container/exec.go
View file

@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"

2
api/server/router/swarm/cluster_routes.go
View file

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
basictypes "github.com/docker/docker/api/types" basictypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"

2
api/server/router/system/system_routes.go
View file

@ -7,7 +7,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/router/build" "github.com/docker/docker/api/server/router/build"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"

2
api/server/router/volume/volume_routes.go
View file

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/versions" "github.com/docker/docker/api/types/versions"

2
api/server/server.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/server/httpstatus" "github.com/docker/docker/api/server/httpstatus"
"github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/middleware" "github.com/docker/docker/api/server/middleware"

2
builder/builder-next/adapters/containerimage/pull.go
View file

@ -15,13 +15,13 @@ import (
"github.com/containerd/containerd/gc" "github.com/containerd/containerd/gc"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
cdreference "github.com/containerd/containerd/reference" cdreference "github.com/containerd/containerd/reference"
ctdreference "github.com/containerd/containerd/reference" ctdreference "github.com/containerd/containerd/reference"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1. "github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1.
"github.com/containerd/log"
distreference "github.com/distribution/reference" distreference "github.com/distribution/reference"
dimages "github.com/docker/docker/daemon/images" dimages "github.com/docker/docker/daemon/images"
"github.com/docker/docker/distribution/metadata" "github.com/docker/docker/distribution/metadata"

2
builder/builder-next/adapters/snapshot/leasemanager.go
View file

@ -5,7 +5,7 @@ import (
"sync" "sync"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/log" "github.com/containerd/log"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
) )

2
builder/builder-next/controller.go
View file

@ -9,9 +9,9 @@ import (
ctd "github.com/containerd/containerd" ctd "github.com/containerd/containerd"
"github.com/containerd/containerd/content/local" "github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/log"
ctdmetadata "github.com/containerd/containerd/metadata" ctdmetadata "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
"github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/builder/builder-next/adapters/containerimage" "github.com/docker/docker/builder/builder-next/adapters/containerimage"

2
builder/builder-next/executor_linux.go
View file

@ -7,7 +7,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/libnetwork" "github.com/docker/docker/libnetwork"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"

2
builder/builder-next/exporter/mobyexporter/writer.go
View file

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"time" "time"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
"github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/util/system" "github.com/moby/buildkit/util/system"

2
builder/builder-next/worker/worker.go
View file

@ -9,9 +9,9 @@ import (
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
"github.com/containerd/log"
"github.com/docker/docker/builder/builder-next/adapters/containerimage" "github.com/docker/docker/builder/builder-next/adapters/containerimage"
mobyexporter "github.com/docker/docker/builder/builder-next/exporter" mobyexporter "github.com/docker/docker/builder/builder-next/exporter"
distmetadata "github.com/docker/docker/distribution/metadata" distmetadata "github.com/docker/docker/distribution/metadata"

2
builder/dockerfile/builder.go
View file

@ -8,8 +8,8 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"

2
builder/dockerfile/containerbackend.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"

2
builder/dockerfile/imagecontext.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"runtime" "runtime"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"
dockerimage "github.com/docker/docker/image" dockerimage "github.com/docker/docker/image"

2
builder/dockerfile/imageprobe.go
View file

@ -3,7 +3,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile"
import ( import (
"context" "context"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"
) )

2
builder/dockerfile/internals.go
View file

@ -10,7 +10,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"

2
builder/remotecontext/detect.go
View file

@ -9,8 +9,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/containerd/containerd/log"
"github.com/containerd/continuity/driver" "github.com/containerd/continuity/driver"
"github.com/containerd/log"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"
"github.com/docker/docker/builder/remotecontext/urlutil" "github.com/docker/docker/builder/remotecontext/urlutil"

2
builder/remotecontext/git.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"os" "os"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"
"github.com/docker/docker/builder/remotecontext/git" "github.com/docker/docker/builder/remotecontext/git"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"

2
cli/debug/debug.go
View file

@ -3,7 +3,7 @@ package debug // import "github.com/docker/docker/cli/debug"
import ( import (
"os" "os"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
// Enable sets the DEBUG env var to true // Enable sets the DEBUG env var to true

2
cli/debug/debug_test.go
View file

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
func TestEnable(t *testing.T) { func TestEnable(t *testing.T) {

2
cmd/dockerd/daemon.go
View file

@ -16,8 +16,8 @@ import (
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
containerddefaults "github.com/containerd/containerd/defaults" containerddefaults "github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/tracing" "github.com/containerd/containerd/tracing"
"github.com/containerd/log"
"github.com/docker/docker/api" "github.com/docker/docker/api"
apiserver "github.com/docker/docker/api/server" apiserver "github.com/docker/docker/api/server"
buildbackend "github.com/docker/docker/api/server/backend/build" buildbackend "github.com/docker/docker/api/server/backend/build"

2
cmd/dockerd/daemon_test.go
View file

@ -3,7 +3,7 @@ package main
import ( import (
"testing" "testing"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/spf13/pflag" "github.com/spf13/pflag"

2
cmd/dockerd/daemon_unix.go
View file

@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon" "github.com/docker/docker/daemon"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/libcontainerd/supervisor" "github.com/docker/docker/libcontainerd/supervisor"

2
cmd/dockerd/daemon_windows.go
View file

@ -6,7 +6,7 @@ import (
"os" "os"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"

2
cmd/dockerd/docker.go
View file

@ -6,7 +6,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"

2
cmd/dockerd/docker_unix.go
View file

@ -5,7 +5,7 @@ package main
import ( import (
"io" "io"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
func runDaemon(opts *daemonOptions) error { func runDaemon(opts *daemonOptions) error {

2
cmd/dockerd/docker_windows.go
View file

@ -5,7 +5,7 @@ import (
"path/filepath" "path/filepath"
"github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/etwlogrus"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
func runDaemon(opts *daemonOptions) error { func runDaemon(opts *daemonOptions) error {

2
cmd/dockerd/grpclog.go
View file

@ -3,7 +3,7 @@ package main
import ( import (
"context" "context"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
) )

2
cmd/dockerd/metrics.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
metrics "github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
) )

2
cmd/dockerd/options.go
View file

@ -5,7 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/homedir"

2
cmd/dockerd/service_windows.go
View file

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
"golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc"

2
cmd/dockerd/trap/trap.go
View file

@ -6,7 +6,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
const ( const (

2
container/container.go
View file

@ -15,7 +15,7 @@ import (
"time" "time"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/log" "github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
mounttypes "github.com/docker/docker/api/types/mount" mounttypes "github.com/docker/docker/api/types/mount"

2
container/container_unix.go
View file

@ -8,8 +8,8 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/containerd/containerd/log"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
container/exec.go
View file

@ -6,7 +6,7 @@ import (
"sync" "sync"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/container/stream" "github.com/docker/docker/container/stream"
"github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/libcontainerd/types"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"

2
container/health.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
) )

2
container/monitor.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
const ( const (

2
container/stream/attach.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/pools"
"github.com/moby/term" "github.com/moby/term"
"github.com/pkg/errors" "github.com/pkg/errors"

2
container/stream/streams.go
View file

@ -8,7 +8,7 @@ import (
"sync" "sync"
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/broadcaster" "github.com/docker/docker/pkg/broadcaster"
"github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/pools"

2
container/view.go
View file

@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"

2
daemon/attach.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/container" "github.com/docker/docker/container"

2
daemon/cdi.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"

2
daemon/cluster/cluster.go
View file

@ -49,7 +49,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
types "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/daemon/cluster/controllers/plugin" "github.com/docker/docker/daemon/cluster/controllers/plugin"

2
daemon/cluster/controllers/plugin/controller.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"net/http" "net/http"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

2
daemon/cluster/controllers/plugin/controller_test.go
View file

@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

2
daemon/cluster/convert/container.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
mounttypes "github.com/docker/docker/api/types/mount" mounttypes "github.com/docker/docker/api/types/mount"
types "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm"

2
daemon/cluster/executor/container/adapter.go
View file

@ -11,7 +11,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"

2
daemon/cluster/executor/container/container.go
View file

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
enginecontainer "github.com/docker/docker/api/types/container" enginecontainer "github.com/docker/docker/api/types/container"

2
daemon/cluster/executor/container/executor.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"

2
daemon/cluster/networks.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/containerd/containerd/log" "github.com/containerd/log"
apitypes "github.com/docker/docker/api/types" apitypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"

2
daemon/cluster/noderunner.go
View file

@ -8,7 +8,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
types "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/daemon/cluster/executor/container" "github.com/docker/docker/daemon/cluster/executor/container"
lncluster "github.com/docker/docker/libnetwork/cluster" lncluster "github.com/docker/docker/libnetwork/cluster"

2
daemon/cluster/services.go
View file

@ -11,7 +11,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"

2
daemon/cluster/swarm.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
apitypes "github.com/docker/docker/api/types" apitypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
types "github.com/docker/docker/api/types/swarm" types "github.com/docker/docker/api/types/swarm"

2
daemon/config/config.go
View file

@ -14,7 +14,7 @@ import (
"golang.org/x/text/encoding/unicode" "golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform" "golang.org/x/text/transform"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
"github.com/docker/docker/registry" "github.com/docker/docker/registry"
"github.com/imdario/mergo" "github.com/imdario/mergo"

2
daemon/config/config_windows.go
View file

@ -5,7 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/log" "github.com/containerd/log"
) )
const ( const (

2
daemon/configs.go
View file

@ -3,7 +3,7 @@ package daemon // import "github.com/docker/docker/daemon"
import ( import (
"context" "context"
"github.com/containerd/containerd/log" "github.com/containerd/log"
swarmtypes "github.com/docker/docker/api/types/swarm" swarmtypes "github.com/docker/docker/api/types/swarm"
) )

2
daemon/container.go
View file

@ -8,7 +8,7 @@ import (
"runtime" "runtime"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/container" "github.com/docker/docker/container"

2
daemon/container_operations.go
View file

@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
networktypes "github.com/docker/docker/api/types/network" networktypes "github.com/docker/docker/api/types/network"

2
daemon/container_operations_unix.go
View file

@ -10,7 +10,7 @@ import (
"strconv" "strconv"
"syscall" "syscall"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/links" "github.com/docker/docker/daemon/links"

2
daemon/container_operations_windows.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/libnetwork" "github.com/docker/docker/libnetwork"

2
daemon/containerd/image.go
View file

@ -12,8 +12,8 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
cplatforms "github.com/containerd/containerd/platforms" cplatforms "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
imagetype "github.com/docker/docker/api/types/image" imagetype "github.com/docker/docker/api/types/image"
"github.com/docker/docker/daemon/images" "github.com/docker/docker/daemon/images"

2
daemon/containerd/image_builder.go
View file

@ -25,7 +25,7 @@ import (
// "github.com/docker/docker/api/types/container" // "github.com/docker/docker/api/types/container"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/image"
"github.com/docker/docker/builder" "github.com/docker/docker/builder"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"

2
daemon/containerd/image_changes.go
View file

@ -3,8 +3,8 @@ package containerd
import ( import (
"context" "context"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/log"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
) )

2
daemon/containerd/image_children.go
View file

@ -6,8 +6,8 @@ import (
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
daemon/containerd/image_commit.go
View file

@ -16,9 +16,9 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/rootfs"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
"github.com/containerd/log"
"github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/image" "github.com/docker/docker/image"
imagespec "github.com/docker/docker/image/spec/specs-go/v1" imagespec "github.com/docker/docker/image/spec/specs-go/v1"

2
daemon/containerd/image_delete.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
daemon/containerd/image_exporter.go
View file

@ -11,8 +11,8 @@ import (
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/images/archive" "github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/log"
cplatforms "github.com/containerd/containerd/platforms" cplatforms "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/container" "github.com/docker/docker/container"

2
daemon/containerd/image_history.go
View file

@ -5,8 +5,8 @@ import (
"sort" "sort"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
cplatforms "github.com/containerd/containerd/platforms" cplatforms "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
imagetype "github.com/docker/docker/api/types/image" imagetype "github.com/docker/docker/api/types/image"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"

2
daemon/containerd/image_import.go
View file

@ -12,8 +12,8 @@ import (
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
daemon/containerd/image_list.go
View file

@ -11,8 +11,8 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/labels" "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"

2
daemon/containerd/image_prune.go
View file

@ -6,7 +6,7 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"

2
daemon/containerd/image_pull.go
View file

@ -7,9 +7,9 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/snapshotters" "github.com/containerd/containerd/pkg/snapshotters"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

2
daemon/containerd/image_push.go
View file

@ -14,10 +14,10 @@ import (
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
containerdlabels "github.com/containerd/containerd/labels" containerdlabels "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

2
daemon/containerd/image_snapshot_unix.go
View file

@ -9,9 +9,9 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
"github.com/containerd/log"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
) )

2
daemon/containerd/image_tag.go
View file

@ -5,7 +5,7 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
containerdimages "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"

2
daemon/containerd/mount.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/container" "github.com/docker/docker/container"
) )

2
daemon/containerd/progress.go
View file

@ -8,9 +8,9 @@ import (
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/log"
"github.com/docker/docker/internal/compatcontext" "github.com/docker/docker/internal/compatcontext"
"github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/progress"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"

2
daemon/containerd/resolver.go
View file

@ -7,10 +7,10 @@ import (
"net/http" "net/http"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/version" "github.com/containerd/containerd/version"
"github.com/containerd/log"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/useragent" "github.com/docker/docker/pkg/useragent"

2
daemon/containerd/service.go
View file

@ -7,10 +7,10 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/docker/container" "github.com/docker/docker/container"
daemonevents "github.com/docker/docker/daemon/events" daemonevents "github.com/docker/docker/daemon/events"

2
daemon/containerfs_linux.go
View file

@ -9,7 +9,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/moby/sys/mount" "github.com/moby/sys/mount"
"github.com/moby/sys/symlink" "github.com/moby/sys/symlink"

2
daemon/create.go
View file

@ -8,8 +8,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
"github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
daemon/create_unix.go
View file

@ -8,7 +8,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/log" "github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
mounttypes "github.com/docker/docker/api/types/mount" mounttypes "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/container" "github.com/docker/docker/container"

2
daemon/daemon.go
View file

@ -19,10 +19,10 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/defaults" "github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/pkg/userns" "github.com/containerd/containerd/pkg/userns"
"github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/remotes/docker"
"github.com/containerd/log"
"github.com/distribution/reference" "github.com/distribution/reference"
dist "github.com/docker/distribution" dist "github.com/docker/distribution"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"

2
daemon/daemon_linux.go
View file

@ -11,7 +11,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"
"github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/resolvconf" "github.com/docker/docker/libnetwork/resolvconf"

2
daemon/daemon_unix.go
View file

@ -18,8 +18,8 @@ import (
"time" "time"
"github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/userns" "github.com/containerd/containerd/pkg/userns"
"github.com/containerd/log"
"github.com/docker/docker/api/types/blkiodev" "github.com/docker/docker/api/types/blkiodev"
pblkiodev "github.com/docker/docker/api/types/blkiodev" pblkiodev "github.com/docker/docker/api/types/blkiodev"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"

2
daemon/daemon_windows.go
View file

@ -10,7 +10,7 @@ import (
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/Microsoft/hcsshim/osversion" "github.com/Microsoft/hcsshim/osversion"
"github.com/containerd/containerd/log" "github.com/containerd/log"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/config"

2
daemon/debugtrap_unix.go
View file

@ -7,7 +7,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/stack" "github.com/docker/docker/pkg/stack"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
daemon/debugtrap_windows.go
View file

@ -6,7 +6,7 @@ import (
"os" "os"
"unsafe" "unsafe"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/stack" "github.com/docker/docker/pkg/stack"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )

2
daemon/delete.go
View file

@ -10,7 +10,7 @@ import (
cerrdefs "github.com/containerd/containerd/errdefs" cerrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases" "github.com/containerd/containerd/leases"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
daemon/events.go
View file

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/container" "github.com/docker/docker/container"

2
daemon/exec.go
View file

@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container" containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"

2
daemon/graphdriver/btrfs/btrfs.go
View file

@ -34,8 +34,8 @@ import (
"sync" "sync"
"unsafe" "unsafe"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/userns" "github.com/containerd/containerd/pkg/userns"
"github.com/containerd/log"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"

2
daemon/graphdriver/driver.go
View file

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugingetter"

2
daemon/graphdriver/fsdiff.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"time" "time"
"github.com/containerd/containerd/log" "github.com/containerd/log"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/chrootarchive"
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"

Some files were not shown because too many files have changed in this diff Show more