diff --git a/api/server/httpstatus/status.go b/api/server/httpstatus/status.go index 54b817fb7c..82ec2347de 100644 --- a/api/server/httpstatus/status.go +++ b/api/server/httpstatus/status.go @@ -6,7 +6,7 @@ import ( "net/http" 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/docker/errdefs" "google.golang.org/grpc/codes" diff --git a/api/server/middleware.go b/api/server/middleware.go index 0bb3601eb3..455bf75726 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -1,7 +1,7 @@ package server // import "github.com/docker/docker/api/server" import ( - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/middleware" ) diff --git a/api/server/middleware/cors.go b/api/server/middleware/cors.go index 3cb754f1bb..a55aa60407 100644 --- a/api/server/middleware/cors.go +++ b/api/server/middleware/cors.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/registry" ) diff --git a/api/server/middleware/debug.go b/api/server/middleware/debug.go index 7e9d660121..1ee083cece 100644 --- a/api/server/middleware/debug.go +++ b/api/server/middleware/debug.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/pkg/ioutils" ) diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go index 6964529d3d..0da19e61c9 100644 --- a/api/server/router/build/build_routes.go +++ b/api/server/router/build/build_routes.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go index fab5c04419..87faf9e811 100644 --- a/api/server/router/container/container_routes.go +++ b/api/server/router/container/container_routes.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/docker/api/server/httpstatus" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" diff --git a/api/server/router/container/exec.go b/api/server/router/container/exec.go index 947216d943..619355a50a 100644 --- a/api/server/router/container/exec.go +++ b/api/server/router/container/exec.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go index 6ba56b4132..68fec7b57c 100644 --- a/api/server/router/swarm/cluster_routes.go +++ b/api/server/router/swarm/cluster_routes.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" basictypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/api/server/router/system/system_routes.go b/api/server/router/system/system_routes.go index 4d5599875b..de5501f68f 100644 --- a/api/server/router/system/system_routes.go +++ b/api/server/router/system/system_routes.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/router/build" "github.com/docker/docker/api/types" diff --git a/api/server/router/volume/volume_routes.go b/api/server/router/volume/volume_routes.go index 0d16c7e63d..abfaece8ea 100644 --- a/api/server/router/volume/volume_routes.go +++ b/api/server/router/volume/volume_routes.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/versions" diff --git a/api/server/server.go b/api/server/server.go index fdd49aed1e..3855197fa2 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/server/httpstatus" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/server/middleware" diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index 705155dfe7..9ee2084d2b 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -15,13 +15,13 @@ import ( "github.com/containerd/containerd/gc" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" cdreference "github.com/containerd/containerd/reference" ctdreference "github.com/containerd/containerd/reference" "github.com/containerd/containerd/remotes" "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/log" distreference "github.com/distribution/reference" dimages "github.com/docker/docker/daemon/images" "github.com/docker/docker/distribution/metadata" diff --git a/builder/builder-next/adapters/snapshot/leasemanager.go b/builder/builder-next/adapters/snapshot/leasemanager.go index 7cdfca279a..4022974632 100644 --- a/builder/builder-next/adapters/snapshot/leasemanager.go +++ b/builder/builder-next/adapters/snapshot/leasemanager.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" + "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/builder/builder-next/controller.go b/builder/builder-next/controller.go index 59981ef239..9f977e127f 100644 --- a/builder/builder-next/controller.go +++ b/builder/builder-next/controller.go @@ -9,9 +9,9 @@ import ( ctd "github.com/containerd/containerd" "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/log" ctdmetadata "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/builder/builder-next/adapters/containerimage" diff --git a/builder/builder-next/executor_linux.go b/builder/builder-next/executor_linux.go index bee2371220..015ee557b3 100644 --- a/builder/builder-next/executor_linux.go +++ b/builder/builder-next/executor_linux.go @@ -7,7 +7,7 @@ import ( "strconv" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/libnetwork" "github.com/docker/docker/pkg/idtools" diff --git a/builder/builder-next/exporter/mobyexporter/writer.go b/builder/builder-next/exporter/mobyexporter/writer.go index e0e5618f5d..2ee7e01a1a 100644 --- a/builder/builder-next/exporter/mobyexporter/writer.go +++ b/builder/builder-next/exporter/mobyexporter/writer.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/moby/buildkit/cache" "github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/system" diff --git a/builder/builder-next/worker/worker.go b/builder/builder-next/worker/worker.go index 07081fa893..b74c793df4 100644 --- a/builder/builder-next/worker/worker.go +++ b/builder/builder-next/worker/worker.go @@ -9,9 +9,9 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/rootfs" + "github.com/containerd/log" "github.com/docker/docker/builder/builder-next/adapters/containerimage" mobyexporter "github.com/docker/docker/builder/builder-next/exporter" distmetadata "github.com/docker/docker/distribution/metadata" diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go index bbdf658592..9cafb7fc5f 100644 --- a/builder/dockerfile/builder.go +++ b/builder/dockerfile/builder.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" diff --git a/builder/dockerfile/containerbackend.go b/builder/dockerfile/containerbackend.go index 3527d3e914..81bb165325 100644 --- a/builder/dockerfile/containerbackend.go +++ b/builder/dockerfile/containerbackend.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/builder" diff --git a/builder/dockerfile/imagecontext.go b/builder/dockerfile/imagecontext.go index e376727145..e943c22951 100644 --- a/builder/dockerfile/imagecontext.go +++ b/builder/dockerfile/imagecontext.go @@ -4,8 +4,8 @@ import ( "context" "runtime" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/builder" dockerimage "github.com/docker/docker/image" diff --git a/builder/dockerfile/imageprobe.go b/builder/dockerfile/imageprobe.go index 886e2a2249..18c25d6c0c 100644 --- a/builder/dockerfile/imageprobe.go +++ b/builder/dockerfile/imageprobe.go @@ -3,7 +3,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/container" "github.com/docker/docker/builder" ) diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go index 2b9ba77f8c..efe7c66e0c 100644 --- a/builder/dockerfile/internals.go +++ b/builder/dockerfile/internals.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" diff --git a/builder/remotecontext/detect.go b/builder/remotecontext/detect.go index 1a4558064c..ac120039e6 100644 --- a/builder/remotecontext/detect.go +++ b/builder/remotecontext/detect.go @@ -9,8 +9,8 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/log" "github.com/containerd/continuity/driver" + "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/builder" "github.com/docker/docker/builder/remotecontext/urlutil" diff --git a/builder/remotecontext/git.go b/builder/remotecontext/git.go index f083179fa9..b22416fb5b 100644 --- a/builder/remotecontext/git.go +++ b/builder/remotecontext/git.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/builder" "github.com/docker/docker/builder/remotecontext/git" "github.com/docker/docker/pkg/archive" diff --git a/cli/debug/debug.go b/cli/debug/debug.go index 0790e0c10e..d127c999d0 100644 --- a/cli/debug/debug.go +++ b/cli/debug/debug.go @@ -3,7 +3,7 @@ package debug // import "github.com/docker/docker/cli/debug" import ( "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // Enable sets the DEBUG env var to true diff --git a/cli/debug/debug_test.go b/cli/debug/debug_test.go index da0224c7dc..466baa5139 100644 --- a/cli/debug/debug_test.go +++ b/cli/debug/debug_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) func TestEnable(t *testing.T) { diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index 366db787d9..837ee7bba1 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -16,8 +16,8 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" containerddefaults "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/tracing" + "github.com/containerd/log" "github.com/docker/docker/api" apiserver "github.com/docker/docker/api/server" buildbackend "github.com/docker/docker/api/server/backend/build" diff --git a/cmd/dockerd/daemon_test.go b/cmd/dockerd/daemon_test.go index 1df2b39c38..015fd2a2c0 100644 --- a/cmd/dockerd/daemon_test.go +++ b/cmd/dockerd/daemon_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/google/go-cmp/cmp/cmpopts" "github.com/spf13/pflag" diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go index c0eae46849..33721c8a24 100644 --- a/cmd/dockerd/daemon_unix.go +++ b/cmd/dockerd/daemon_unix.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon" "github.com/docker/docker/daemon/config" "github.com/docker/docker/libcontainerd/supervisor" diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go index 5d584d571b..b56be6b749 100644 --- a/cmd/dockerd/daemon_windows.go +++ b/cmd/dockerd/daemon_windows.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/pkg/system" "golang.org/x/sys/windows" diff --git a/cmd/dockerd/docker.go b/cmd/dockerd/docker.go index 0b0e2b43f6..3f3c8a7202 100644 --- a/cmd/dockerd/docker.go +++ b/cmd/dockerd/docker.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/reexec" diff --git a/cmd/dockerd/docker_unix.go b/cmd/dockerd/docker_unix.go index 86146d6bbf..f716434168 100644 --- a/cmd/dockerd/docker_unix.go +++ b/cmd/dockerd/docker_unix.go @@ -5,7 +5,7 @@ package main import ( "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) func runDaemon(opts *daemonOptions) error { diff --git a/cmd/dockerd/docker_windows.go b/cmd/dockerd/docker_windows.go index 027d9374ad..a0c843be00 100644 --- a/cmd/dockerd/docker_windows.go +++ b/cmd/dockerd/docker_windows.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/Microsoft/go-winio/pkg/etwlogrus" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) func runDaemon(opts *daemonOptions) error { diff --git a/cmd/dockerd/grpclog.go b/cmd/dockerd/grpclog.go index f1de83c68d..b90408a469 100644 --- a/cmd/dockerd/grpclog.go +++ b/cmd/dockerd/grpclog.go @@ -3,7 +3,7 @@ package main import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "google.golang.org/grpc/grpclog" ) diff --git a/cmd/dockerd/metrics.go b/cmd/dockerd/metrics.go index 5ef0590f95..dafb60303c 100644 --- a/cmd/dockerd/metrics.go +++ b/cmd/dockerd/metrics.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" metrics "github.com/docker/go-metrics" ) diff --git a/cmd/dockerd/options.go b/cmd/dockerd/options.go index d1773c9e30..405dffe43a 100644 --- a/cmd/dockerd/options.go +++ b/cmd/dockerd/options.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/opts" "github.com/docker/docker/pkg/homedir" diff --git a/cmd/dockerd/service_windows.go b/cmd/dockerd/service_windows.go index 2ccca17cb7..31e375f227 100644 --- a/cmd/dockerd/service_windows.go +++ b/cmd/dockerd/service_windows.go @@ -10,7 +10,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/spf13/pflag" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" diff --git a/cmd/dockerd/trap/trap.go b/cmd/dockerd/trap/trap.go index ce24a2d709..579bed0985 100644 --- a/cmd/dockerd/trap/trap.go +++ b/cmd/dockerd/trap/trap.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/container/container.go b/container/container.go index cc21c589b5..bc21a33881 100644 --- a/container/container.go +++ b/container/container.go @@ -15,7 +15,7 @@ import ( "time" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" mounttypes "github.com/docker/docker/api/types/mount" diff --git a/container/container_unix.go b/container/container_unix.go index ada3512e6a..80cf5e58dd 100644 --- a/container/container_unix.go +++ b/container/container_unix.go @@ -8,8 +8,8 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/log" "github.com/containerd/continuity/fs" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/container/exec.go b/container/exec.go index 13d83468e0..328b596b04 100644 --- a/container/exec.go +++ b/container/exec.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container/stream" "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/stringid" diff --git a/container/health.go b/container/health.go index 97faa28ccf..ea354315cc 100644 --- a/container/health.go +++ b/container/health.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" ) diff --git a/container/monitor.go b/container/monitor.go index 1e2922f60f..60a6228ee4 100644 --- a/container/monitor.go +++ b/container/monitor.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/container/stream/attach.go b/container/stream/attach.go index 6480abc102..6079d20d1e 100644 --- a/container/stream/attach.go +++ b/container/stream/attach.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/pools" "github.com/moby/term" "github.com/pkg/errors" diff --git a/container/stream/streams.go b/container/stream/streams.go index e7446ed116..78ec048396 100644 --- a/container/stream/streams.go +++ b/container/stream/streams.go @@ -8,7 +8,7 @@ import ( "sync" "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/ioutils" "github.com/docker/docker/pkg/pools" diff --git a/container/view.go b/container/view.go index 1174a01e88..5487beacaf 100644 --- a/container/view.go +++ b/container/view.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" "github.com/docker/docker/errdefs" diff --git a/daemon/attach.go b/daemon/attach.go index 334a39ca6a..18480df5db 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" diff --git a/daemon/cdi.go b/daemon/cdi.go index 1b4a0534ae..2866e24bc1 100644 --- a/daemon/cdi.go +++ b/daemon/cdi.go @@ -5,7 +5,7 @@ import ( "fmt" "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/hashicorp/go-multierror" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 19e93ef899..3b00449600 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -49,7 +49,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/network" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/controllers/plugin" diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go index 670fa57442..52d52a81c6 100644 --- a/daemon/cluster/controllers/plugin/controller.go +++ b/daemon/cluster/controllers/plugin/controller.go @@ -5,7 +5,7 @@ import ( "io" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" diff --git a/daemon/cluster/controllers/plugin/controller_test.go b/daemon/cluster/controllers/plugin/controller_test.go index 29b434f671..3e93de5573 100644 --- a/daemon/cluster/controllers/plugin/controller_test.go +++ b/daemon/cluster/controllers/plugin/controller_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/registry" diff --git a/daemon/cluster/convert/container.go b/daemon/cluster/convert/container.go index 0c7d77d5e7..77001774fe 100644 --- a/daemon/cluster/convert/container.go +++ b/daemon/cluster/convert/container.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" types "github.com/docker/docker/api/types/swarm" diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 5a44904a0a..e59648736a 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go index 8ad7b4af76..a3eb101152 100644 --- a/daemon/cluster/executor/container/container.go +++ b/daemon/cluster/executor/container/container.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" enginecontainer "github.com/docker/docker/api/types/container" diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go index db0a1b6260..113d65fc19 100644 --- a/daemon/cluster/executor/container/executor.go +++ b/daemon/cluster/executor/container/executor.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" diff --git a/daemon/cluster/networks.go b/daemon/cluster/networks.go index aacfdb2463..00d076e0a0 100644 --- a/daemon/cluster/networks.go +++ b/daemon/cluster/networks.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" apitypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" diff --git a/daemon/cluster/noderunner.go b/daemon/cluster/noderunner.go index 11f5b565a0..23ae650f26 100644 --- a/daemon/cluster/noderunner.go +++ b/daemon/cluster/noderunner.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/executor/container" lncluster "github.com/docker/docker/libnetwork/cluster" diff --git a/daemon/cluster/services.go b/daemon/cluster/services.go index 26aaf13a3f..2403a2451d 100644 --- a/daemon/cluster/services.go +++ b/daemon/cluster/services.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/daemon/cluster/swarm.go b/daemon/cluster/swarm.go index 5681f29d82..e5e51d92e7 100644 --- a/daemon/cluster/swarm.go +++ b/daemon/cluster/swarm.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" apitypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" types "github.com/docker/docker/api/types/swarm" diff --git a/daemon/config/config.go b/daemon/config/config.go index 0675dd01b8..7bbb759022 100644 --- a/daemon/config/config.go +++ b/daemon/config/config.go @@ -14,7 +14,7 @@ import ( "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/opts" "github.com/docker/docker/registry" "github.com/imdario/mergo" diff --git a/daemon/config/config_windows.go b/daemon/config/config_windows.go index d36c52c322..07b987d4db 100644 --- a/daemon/config/config_windows.go +++ b/daemon/config/config_windows.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/daemon/configs.go b/daemon/configs.go index 63546d7e0a..57b646b8cc 100644 --- a/daemon/configs.go +++ b/daemon/configs.go @@ -3,7 +3,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" swarmtypes "github.com/docker/docker/api/types/swarm" ) diff --git a/daemon/container.go b/daemon/container.go index 57bdc01e70..e9b26cccb5 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/container" diff --git a/daemon/container_operations.go b/daemon/container_operations.go index 0e41b8b41a..3fd7d30626 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" networktypes "github.com/docker/docker/api/types/network" diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index 25549ea8d0..6a23a4ca92 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -10,7 +10,7 @@ import ( "strconv" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/links" diff --git a/daemon/container_operations_windows.go b/daemon/container_operations_windows.go index 53abde3f9a..d52898a8f4 100644 --- a/daemon/container_operations_windows.go +++ b/daemon/container_operations_windows.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/docker/docker/daemon/config" "github.com/docker/docker/libnetwork" diff --git a/daemon/containerd/image.go b/daemon/containerd/image.go index 28c23e040c..e17ef925c6 100644 --- a/daemon/containerd/image.go +++ b/daemon/containerd/image.go @@ -12,8 +12,8 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" cplatforms "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" imagetype "github.com/docker/docker/api/types/image" "github.com/docker/docker/daemon/images" diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go index 3ef519d7c5..fc63a6e417 100644 --- a/daemon/containerd/image_builder.go +++ b/daemon/containerd/image_builder.go @@ -25,7 +25,7 @@ import ( // "github.com/docker/docker/api/types/container" 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/builder" "github.com/docker/docker/errdefs" diff --git a/daemon/containerd/image_changes.go b/daemon/containerd/image_changes.go index d51de8a06f..e540ec40d3 100644 --- a/daemon/containerd/image_changes.go +++ b/daemon/containerd/image_changes.go @@ -3,8 +3,8 @@ package containerd import ( "context" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/docker/docker/pkg/archive" ) diff --git a/daemon/containerd/image_children.go b/daemon/containerd/image_children.go index 0f9d9d0d1b..5f9c129b4c 100644 --- a/daemon/containerd/image_children.go +++ b/daemon/containerd/image_children.go @@ -6,8 +6,8 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/image" "github.com/opencontainers/go-digest" diff --git a/daemon/containerd/image_commit.go b/daemon/containerd/image_commit.go index fa7edc2666..85be475393 100644 --- a/daemon/containerd/image_commit.go +++ b/daemon/containerd/image_commit.go @@ -16,9 +16,9 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/rootfs" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/image" imagespec "github.com/docker/docker/image/spec/specs-go/v1" diff --git a/daemon/containerd/image_delete.go b/daemon/containerd/image_delete.go index 43bd60f497..4efbaf7773 100644 --- a/daemon/containerd/image_delete.go +++ b/daemon/containerd/image_delete.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" diff --git a/daemon/containerd/image_exporter.go b/daemon/containerd/image_exporter.go index 99c8f85cc9..1967719785 100644 --- a/daemon/containerd/image_exporter.go +++ b/daemon/containerd/image_exporter.go @@ -11,8 +11,8 @@ import ( containerdimages "github.com/containerd/containerd/images" "github.com/containerd/containerd/images/archive" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" cplatforms "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" diff --git a/daemon/containerd/image_history.go b/daemon/containerd/image_history.go index ada4ce813d..53e54c1f30 100644 --- a/daemon/containerd/image_history.go +++ b/daemon/containerd/image_history.go @@ -5,8 +5,8 @@ import ( "sort" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" cplatforms "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" imagetype "github.com/docker/docker/api/types/image" "github.com/docker/docker/errdefs" diff --git a/daemon/containerd/image_import.go b/daemon/containerd/image_import.go index 205a091735..8b33053d46 100644 --- a/daemon/containerd/image_import.go +++ b/daemon/containerd/image_import.go @@ -12,8 +12,8 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/containerd/image_list.go b/daemon/containerd/image_list.go index e4ddbbac35..8a38b8888b 100644 --- a/daemon/containerd/image_list.go +++ b/daemon/containerd/image_list.go @@ -11,8 +11,8 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/daemon/containerd/image_prune.go b/daemon/containerd/image_prune.go index f095249c3d..41ce1fcc47 100644 --- a/daemon/containerd/image_prune.go +++ b/daemon/containerd/image_prune.go @@ -6,7 +6,7 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/daemon/containerd/image_pull.go b/daemon/containerd/image_pull.go index d65117c05b..457c4cd97f 100644 --- a/daemon/containerd/image_pull.go +++ b/daemon/containerd/image_pull.go @@ -7,9 +7,9 @@ import ( "github.com/containerd/containerd" cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/snapshotters" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/registry" diff --git a/daemon/containerd/image_push.go b/daemon/containerd/image_push.go index 1c3c04a241..2901f0fe41 100644 --- a/daemon/containerd/image_push.go +++ b/daemon/containerd/image_push.go @@ -14,10 +14,10 @@ import ( "github.com/containerd/containerd/images" containerdimages "github.com/containerd/containerd/images" containerdlabels "github.com/containerd/containerd/labels" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/registry" diff --git a/daemon/containerd/image_snapshot_unix.go b/daemon/containerd/image_snapshot_unix.go index ee85bc8839..d14b90e625 100644 --- a/daemon/containerd/image_snapshot_unix.go +++ b/daemon/containerd/image_snapshot_unix.go @@ -9,9 +9,9 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/docker/docker/pkg/idtools" ) diff --git a/daemon/containerd/image_tag.go b/daemon/containerd/image_tag.go index 1bfeb0af64..251e994988 100644 --- a/daemon/containerd/image_tag.go +++ b/daemon/containerd/image_tag.go @@ -5,7 +5,7 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" containerdimages "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/events" "github.com/docker/docker/errdefs" diff --git a/daemon/containerd/mount.go b/daemon/containerd/mount.go index edd63776eb..7f9b7ca929 100644 --- a/daemon/containerd/mount.go +++ b/daemon/containerd/mount.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" ) diff --git a/daemon/containerd/progress.go b/daemon/containerd/progress.go index 4daab81cbe..13d228a310 100644 --- a/daemon/containerd/progress.go +++ b/daemon/containerd/progress.go @@ -8,9 +8,9 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/docker/docker/internal/compatcontext" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/stringid" diff --git a/daemon/containerd/resolver.go b/daemon/containerd/resolver.go index 306fafa060..267179d5fc 100644 --- a/daemon/containerd/resolver.go +++ b/daemon/containerd/resolver.go @@ -7,10 +7,10 @@ import ( "net/http" cerrdefs "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/version" + "github.com/containerd/log" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/useragent" diff --git a/daemon/containerd/service.go b/daemon/containerd/service.go index 0fee95df9f..70990a39a2 100644 --- a/daemon/containerd/service.go +++ b/daemon/containerd/service.go @@ -7,10 +7,10 @@ import ( "github.com/containerd/containerd" cerrdefs "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/remotes/docker" "github.com/containerd/containerd/snapshots" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/container" daemonevents "github.com/docker/docker/daemon/events" diff --git a/daemon/containerfs_linux.go b/daemon/containerfs_linux.go index 78926afdd9..384c86b3f0 100644 --- a/daemon/containerfs_linux.go +++ b/daemon/containerfs_linux.go @@ -9,7 +9,7 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/hashicorp/go-multierror" "github.com/moby/sys/mount" "github.com/moby/sys/symlink" diff --git a/daemon/create.go b/daemon/create.go index 834dcb0109..eada2d305a 100644 --- a/daemon/create.go +++ b/daemon/create.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/create_unix.go b/daemon/create_unix.go index 5a664333e5..228d4a62e9 100644 --- a/daemon/create_unix.go +++ b/daemon/create_unix.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/container" diff --git a/daemon/daemon.go b/daemon/daemon.go index 01008f5b59..bc47ac5fec 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -19,10 +19,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/dialer" "github.com/containerd/containerd/pkg/userns" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/distribution/reference" dist "github.com/docker/distribution" "github.com/docker/docker/api/types" diff --git a/daemon/daemon_linux.go b/daemon/daemon_linux.go index f2fec32f21..fa1b90fe0f 100644 --- a/daemon/daemon_linux.go +++ b/daemon/daemon_linux.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/resolvconf" diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index f4637039f7..4b9c1a2aa6 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -18,8 +18,8 @@ import ( "time" "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/api/types/blkiodev" pblkiodev "github.com/docker/docker/api/types/blkiodev" containertypes "github.com/docker/docker/api/types/container" diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index e4f961e5dd..d1f004a537 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -10,7 +10,7 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/osversion" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/container" "github.com/docker/docker/daemon/config" diff --git a/daemon/debugtrap_unix.go b/daemon/debugtrap_unix.go index 35d3e5a554..ad4ec39233 100644 --- a/daemon/debugtrap_unix.go +++ b/daemon/debugtrap_unix.go @@ -7,7 +7,7 @@ import ( "os" "os/signal" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/stack" "golang.org/x/sys/unix" ) diff --git a/daemon/debugtrap_windows.go b/daemon/debugtrap_windows.go index 64eba67975..8cfdbc02af 100644 --- a/daemon/debugtrap_windows.go +++ b/daemon/debugtrap_windows.go @@ -6,7 +6,7 @@ import ( "os" "unsafe" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/stack" "golang.org/x/sys/windows" ) diff --git a/daemon/delete.go b/daemon/delete.go index a2d3c9c7ec..fd325cf303 100644 --- a/daemon/delete.go +++ b/daemon/delete.go @@ -10,7 +10,7 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/events.go b/daemon/events.go index 5ded261ad8..31def32323 100644 --- a/daemon/events.go +++ b/daemon/events.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/container" diff --git a/daemon/exec.go b/daemon/exec.go index 347ec2f5b1..2ab0b6b409 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -10,7 +10,7 @@ import ( "time" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index 700fb8d7e5..6aaa33cf76 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -34,8 +34,8 @@ import ( "sync" "unsafe" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/containerfs" "github.com/docker/docker/pkg/idtools" diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go index 7be7cbc1df..6ddde44b89 100644 --- a/daemon/graphdriver/driver.go +++ b/daemon/graphdriver/driver.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/plugingetter" diff --git a/daemon/graphdriver/fsdiff.go b/daemon/graphdriver/fsdiff.go index 64c6551e94..79560686ca 100644 --- a/daemon/graphdriver/fsdiff.go +++ b/daemon/graphdriver/fsdiff.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/chrootarchive" "github.com/docker/docker/pkg/idtools" diff --git a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go index addc3045b7..b8a765b4d2 100644 --- a/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go +++ b/daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/overlayutils" "github.com/docker/docker/pkg/archive" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 9ca73c28b0..4f61ac8c08 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/daemon/graphdriver/overlay2/overlay.go @@ -14,8 +14,8 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" "github.com/containerd/continuity/fs" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver/overlayutils" "github.com/docker/docker/pkg/archive" diff --git a/daemon/graphdriver/overlayutils/overlayutils.go b/daemon/graphdriver/overlayutils/overlayutils.go index de69b4bad2..d5ead3bfdb 100644 --- a/daemon/graphdriver/overlayutils/overlayutils.go +++ b/daemon/graphdriver/overlayutils/overlayutils.go @@ -9,8 +9,8 @@ import ( "path" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/pkg/errors" "golang.org/x/sys/unix" diff --git a/daemon/graphdriver/overlayutils/randomid.go b/daemon/graphdriver/overlayutils/randomid.go index d523f665c2..e27b3c5105 100644 --- a/daemon/graphdriver/overlayutils/randomid.go +++ b/daemon/graphdriver/overlayutils/randomid.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/overlayutils/userxattr.go b/daemon/graphdriver/overlayutils/userxattr.go index 4de9f8ebd4..62d0a4a4b3 100644 --- a/daemon/graphdriver/overlayutils/userxattr.go +++ b/daemon/graphdriver/overlayutils/userxattr.go @@ -25,9 +25,9 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/pkg/parsers/kernel" ) diff --git a/daemon/graphdriver/vfs/quota_linux.go b/daemon/graphdriver/vfs/quota_linux.go index d344bafc3d..101566fad6 100644 --- a/daemon/graphdriver/vfs/quota_linux.go +++ b/daemon/graphdriver/vfs/quota_linux.go @@ -3,7 +3,7 @@ package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/quota" ) diff --git a/daemon/graphdriver/windows/windows.go b/daemon/graphdriver/windows/windows.go index b5fa3630e6..7980824f56 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -24,7 +24,7 @@ import ( "github.com/Microsoft/go-winio/vhd" "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/osversion" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" diff --git a/daemon/graphdriver/zfs/zfs.go b/daemon/graphdriver/zfs/zfs.go index 8af76a384f..d62a618515 100644 --- a/daemon/graphdriver/zfs/zfs.go +++ b/daemon/graphdriver/zfs/zfs.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/parsers" diff --git a/daemon/graphdriver/zfs/zfs_freebsd.go b/daemon/graphdriver/zfs/zfs_freebsd.go index eafe6ea8e0..a48ebab362 100644 --- a/daemon/graphdriver/zfs/zfs_freebsd.go +++ b/daemon/graphdriver/zfs/zfs_freebsd.go @@ -3,7 +3,7 @@ package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs" import ( "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "golang.org/x/sys/unix" ) diff --git a/daemon/graphdriver/zfs/zfs_linux.go b/daemon/graphdriver/zfs/zfs_linux.go index faf1d65e8b..fb40308226 100644 --- a/daemon/graphdriver/zfs/zfs_linux.go +++ b/daemon/graphdriver/zfs/zfs_linux.go @@ -3,7 +3,7 @@ package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" ) diff --git a/daemon/health.go b/daemon/health.go index d882b2bc0d..e454caf526 100644 --- a/daemon/health.go +++ b/daemon/health.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/images/cache.go b/daemon/images/cache.go index 29e96af1e2..cc4ba13f75 100644 --- a/daemon/images/cache.go +++ b/daemon/images/cache.go @@ -3,7 +3,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" imagetypes "github.com/docker/docker/api/types/image" "github.com/docker/docker/builder" "github.com/docker/docker/image/cache" diff --git a/daemon/images/image.go b/daemon/images/image.go index 6c53cda35d..0b50862ca8 100644 --- a/daemon/images/image.go +++ b/daemon/images/image.go @@ -10,8 +10,8 @@ import ( cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" imagetypes "github.com/docker/docker/api/types/image" "github.com/docker/docker/errdefs" diff --git a/daemon/images/image_builder.go b/daemon/images/image_builder.go index 458b00db31..5ff81d8954 100644 --- a/daemon/images/image_builder.go +++ b/daemon/images/image_builder.go @@ -6,8 +6,8 @@ import ( "io" "runtime" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/backend" imagetypes "github.com/docker/docker/api/types/image" diff --git a/daemon/images/image_exporter.go b/daemon/images/image_exporter.go index 9bb16f7119..0a863dd604 100644 --- a/daemon/images/image_exporter.go +++ b/daemon/images/image_exporter.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/docker/docker/image/tarexport" ) diff --git a/daemon/images/image_prune.go b/daemon/images/image_prune.go index 875230f935..7ade3409d7 100644 --- a/daemon/images/image_prune.go +++ b/daemon/images/image_prune.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" diff --git a/daemon/images/image_pull.go b/daemon/images/image_pull.go index 9e1b89297d..9b1cbcb62b 100644 --- a/daemon/images/image_pull.go +++ b/daemon/images/image_pull.go @@ -6,8 +6,8 @@ import ( "time" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log" "github.com/distribution/reference" imagetypes "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" diff --git a/daemon/images/image_unix.go b/daemon/images/image_unix.go index eb8eed3af0..0f827bce84 100644 --- a/daemon/images/image_unix.go +++ b/daemon/images/image_unix.go @@ -5,7 +5,7 @@ package images // import "github.com/docker/docker/daemon/images" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/image" "github.com/docker/docker/layer" ) diff --git a/daemon/images/mount.go b/daemon/images/mount.go index 827d7ab028..cfec28399b 100644 --- a/daemon/images/mount.go +++ b/daemon/images/mount.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/pkg/errors" ) diff --git a/daemon/images/store.go b/daemon/images/store.go index 637c74628e..7f23806173 100644 --- a/daemon/images/store.go +++ b/daemon/images/store.go @@ -7,8 +7,8 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/leases" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" + "github.com/containerd/log" "github.com/docker/docker/distribution" "github.com/docker/docker/image" "github.com/docker/docker/layer" diff --git a/daemon/info.go b/daemon/info.go index ca0dbc4bd3..4587814c2d 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/system" diff --git a/daemon/info_unix.go b/daemon/info_unix.go index 7ee795f20a..9d92bc6143 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/system" diff --git a/daemon/kill.go b/daemon/kill.go index 7c62827245..8849811e96 100644 --- a/daemon/kill.go +++ b/daemon/kill.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" containerpkg "github.com/docker/docker/container" "github.com/docker/docker/errdefs" diff --git a/daemon/list.go b/daemon/list.go index 3687386904..5949bde858 100644 --- a/daemon/list.go +++ b/daemon/list.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" imagetypes "github.com/docker/docker/api/types/image" diff --git a/daemon/listeners/listeners_linux.go b/daemon/listeners/listeners_linux.go index e0fd2bfe12..71b9c62e63 100644 --- a/daemon/listeners/listeners_linux.go +++ b/daemon/listeners/listeners_linux.go @@ -7,7 +7,7 @@ import ( "os" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/coreos/go-systemd/v22/activation" "github.com/docker/docker/pkg/homedir" "github.com/docker/go-connections/sockets" diff --git a/daemon/logger/adapter.go b/daemon/logger/adapter.go index c76ba33681..95ed5a859e 100644 --- a/daemon/logger/adapter.go +++ b/daemon/logger/adapter.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/plugins/logdriver" "github.com/docker/docker/pkg/plugingetter" "github.com/pkg/errors" diff --git a/daemon/logger/awslogs/cloudwatchlogs.go b/daemon/logger/awslogs/cloudwatchlogs.go index d56961edd9..d093a6cba6 100644 --- a/daemon/logger/awslogs/cloudwatchlogs.go +++ b/daemon/logger/awslogs/cloudwatchlogs.go @@ -22,7 +22,7 @@ import ( "github.com/aws/smithy-go" smithymiddleware "github.com/aws/smithy-go/middleware" smithyhttp "github.com/aws/smithy-go/transport/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/dockerversion" diff --git a/daemon/logger/copier.go b/daemon/logger/copier.go index 35ed4b3715..ac9639840e 100644 --- a/daemon/logger/copier.go +++ b/daemon/logger/copier.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" types "github.com/docker/docker/api/types/backend" "github.com/docker/docker/pkg/stringid" ) diff --git a/daemon/logger/etwlogs/etwlogs_windows.go b/daemon/logger/etwlogs/etwlogs_windows.go index c2c0b2a0ca..d54f803206 100644 --- a/daemon/logger/etwlogs/etwlogs_windows.go +++ b/daemon/logger/etwlogs/etwlogs_windows.go @@ -19,7 +19,7 @@ import ( "sync" "unsafe" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "golang.org/x/sys/windows" ) @@ -42,9 +42,12 @@ var ( procEventWriteString = modAdvapi32.NewProc("EventWriteString") procEventUnregister = modAdvapi32.NewProc("EventUnregister") ) -var providerHandle windows.Handle -var refCount int -var mu sync.Mutex + +var ( + providerHandle windows.Handle + refCount int + mu sync.Mutex +) func init() { providerHandle = windows.InvalidHandle @@ -149,7 +152,6 @@ func callEventRegister() error { func callEventWriteString(message string) error { utf16message, err := windows.UTF16FromString(message) - if err != nil { return err } diff --git a/daemon/logger/fluentd/fluentd.go b/daemon/logger/fluentd/fluentd.go index 43ca2c054a..ab0a657ddf 100644 --- a/daemon/logger/fluentd/fluentd.go +++ b/daemon/logger/fluentd/fluentd.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/errdefs" diff --git a/daemon/logger/gcplogs/gcplogging.go b/daemon/logger/gcplogs/gcplogging.go index db3f0eedf4..b6758182a3 100644 --- a/daemon/logger/gcplogs/gcplogging.go +++ b/daemon/logger/gcplogs/gcplogging.go @@ -11,7 +11,7 @@ import ( "cloud.google.com/go/compute/metadata" "cloud.google.com/go/logging" - "github.com/containerd/containerd/log" + "github.com/containerd/log" mrpb "google.golang.org/genproto/googleapis/api/monitoredres" ) diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go index c5798855de..6e057b5179 100644 --- a/daemon/logger/journald/read.go +++ b/daemon/logger/journald/read.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/coreos/go-systemd/v22/journal" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/daemon/logger" diff --git a/daemon/logger/logentries/logentries.go b/daemon/logger/logentries/logentries.go index 803ec8b856..5ade4bc34e 100644 --- a/daemon/logger/logentries/logentries.go +++ b/daemon/logger/logentries/logentries.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/bsphere/le_go" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/pkg/errors" ) diff --git a/daemon/logger/logger_error.go b/daemon/logger/logger_error.go index 1ebdec6c2a..fb72aba442 100644 --- a/daemon/logger/logger_error.go +++ b/daemon/logger/logger_error.go @@ -3,7 +3,7 @@ package logger import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/time/rate" ) diff --git a/daemon/logger/loggerutils/cache/local_cache.go b/daemon/logger/loggerutils/cache/local_cache.go index 39218234af..d5adfd4ffa 100644 --- a/daemon/logger/loggerutils/cache/local_cache.go +++ b/daemon/logger/loggerutils/cache/local_cache.go @@ -4,7 +4,7 @@ import ( "context" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/container" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/local" diff --git a/daemon/logger/loggerutils/follow.go b/daemon/logger/loggerutils/follow.go index 6ef551ff51..106101937a 100644 --- a/daemon/logger/loggerutils/follow.go +++ b/daemon/logger/loggerutils/follow.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/pkg/errors" ) diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go index 51726b99a2..572a3a7952 100644 --- a/daemon/logger/loggerutils/logfile.go +++ b/daemon/logger/loggerutils/logfile.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/pkg/pools" "github.com/pkg/errors" diff --git a/daemon/logger/splunk/splunk.go b/daemon/logger/splunk/splunk.go index 4d9a92a429..ea4de8150d 100644 --- a/daemon/logger/splunk/splunk.go +++ b/daemon/logger/splunk/splunk.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/loggerutils" "github.com/docker/docker/pkg/pools" diff --git a/daemon/logs.go b/daemon/logs.go index 20c7ffa26d..6e1267212b 100644 --- a/daemon/logs.go +++ b/daemon/logs.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" containertypes "github.com/docker/docker/api/types/container" diff --git a/daemon/metrics.go b/daemon/metrics.go index afbdbb06fe..302774ff97 100644 --- a/daemon/metrics.go +++ b/daemon/metrics.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" diff --git a/daemon/metrics_unix.go b/daemon/metrics_unix.go index 2514149857..24fd6cb551 100644 --- a/daemon/metrics_unix.go +++ b/daemon/metrics_unix.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" diff --git a/daemon/monitor.go b/daemon/monitor.go index 409c415acd..200fd40618 100644 --- a/daemon/monitor.go +++ b/daemon/monitor.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" diff --git a/daemon/mounts.go b/daemon/mounts.go index b562fa50ea..cfc27052ac 100644 --- a/daemon/mounts.go +++ b/daemon/mounts.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/container" volumesservice "github.com/docker/docker/volume/service" diff --git a/daemon/names.go b/daemon/names.go index 86bf9c51f2..7869798752 100644 --- a/daemon/names.go +++ b/daemon/names.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/container" "github.com/docker/docker/daemon/names" "github.com/docker/docker/errdefs" diff --git a/daemon/network.go b/daemon/network.go index 28cd5352e8..5e467d7ed4 100644 --- a/daemon/network.go +++ b/daemon/network.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 45f19026aa..77b89bf80d 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -11,10 +11,10 @@ import ( cdcgroups "github.com/containerd/cgroups/v3" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" coci "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/apparmor" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/container" dconfig "github.com/docker/docker/daemon/config" diff --git a/daemon/oci_windows.go b/daemon/oci_windows.go index 3e84fca2c6..edcec0202e 100644 --- a/daemon/oci_windows.go +++ b/daemon/oci_windows.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" coci "github.com/containerd/containerd/oci" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" imagetypes "github.com/docker/docker/api/types/image" "github.com/docker/docker/container" diff --git a/daemon/pause.go b/daemon/pause.go index 1633df98fe..1071d53ba1 100644 --- a/daemon/pause.go +++ b/daemon/pause.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" ) diff --git a/daemon/prune.go b/daemon/prune.go index cc661c75e7..6f1f131e02 100644 --- a/daemon/prune.go +++ b/daemon/prune.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/daemon/reload.go b/daemon/reload.go index 04f08d0e4c..63eb3f0100 100644 --- a/daemon/reload.go +++ b/daemon/reload.go @@ -6,7 +6,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" "github.com/hashicorp/go-multierror" "github.com/mitchellh/copystructure" diff --git a/daemon/reload_test.go b/daemon/reload_test.go index affe865f48..de606f3c60 100644 --- a/daemon/reload_test.go +++ b/daemon/reload_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/daemon/images" "github.com/docker/docker/libnetwork" diff --git a/daemon/rename.go b/daemon/rename.go index 8b33b4a3c0..91eec7d3d2 100644 --- a/daemon/rename.go +++ b/daemon/rename.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" dockercontainer "github.com/docker/docker/container" "github.com/docker/docker/errdefs" diff --git a/daemon/runtime_unix.go b/daemon/runtime_unix.go index f4fff8da5f..753b2afd1c 100644 --- a/daemon/runtime_unix.go +++ b/daemon/runtime_unix.go @@ -15,10 +15,10 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/plugin" v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/log" "github.com/docker/docker/daemon/config" "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd/shimopts" diff --git a/daemon/seccomp_linux.go b/daemon/seccomp_linux.go index 4d1ff76865..0194000824 100644 --- a/daemon/seccomp_linux.go +++ b/daemon/seccomp_linux.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" coci "github.com/containerd/containerd/oci" + "github.com/containerd/log" "github.com/docker/docker/container" dconfig "github.com/docker/docker/daemon/config" "github.com/docker/docker/profiles/seccomp" diff --git a/daemon/secrets.go b/daemon/secrets.go index c81355495c..06c03687b0 100644 --- a/daemon/secrets.go +++ b/daemon/secrets.go @@ -3,7 +3,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" swarmtypes "github.com/docker/docker/api/types/swarm" ) diff --git a/daemon/snapshotter/mount.go b/daemon/snapshotter/mount.go index b89d0a707e..0684c7e823 100644 --- a/daemon/snapshotter/mount.go +++ b/daemon/snapshotter/mount.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" + "github.com/containerd/log" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/idtools" "github.com/moby/locker" diff --git a/daemon/start.go b/daemon/start.go index c903944057..5ea8f70ec0 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -5,7 +5,7 @@ import ( "runtime" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" diff --git a/daemon/stats.go b/daemon/stats.go index bfafd89270..342d7a9c66 100644 --- a/daemon/stats.go +++ b/daemon/stats.go @@ -7,7 +7,7 @@ import ( "runtime" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/versions" diff --git a/daemon/stop.go b/daemon/stop.go index 5acd472d54..93d975a3c8 100644 --- a/daemon/stop.go +++ b/daemon/stop.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" diff --git a/daemon/unpause.go b/daemon/unpause.go index fbb83bda8b..2ea14c1fe7 100644 --- a/daemon/unpause.go +++ b/daemon/unpause.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" "github.com/docker/docker/container" ) diff --git a/daemon/volumes.go b/daemon/volumes.go index a0667843f1..c1e62cf73a 100644 --- a/daemon/volumes.go +++ b/daemon/volumes.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" containertypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" mounttypes "github.com/docker/docker/api/types/mount" diff --git a/distribution/errors.go b/distribution/errors.go index 366a1956db..24315d4485 100644 --- a/distribution/errors.go +++ b/distribution/errors.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/distribution/registry/api/errcode" diff --git a/distribution/manifest.go b/distribution/manifest.go index c7f518b040..2e91b40d65 100644 --- a/distribution/manifest.go +++ b/distribution/manifest.go @@ -9,8 +9,8 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" diff --git a/distribution/pull.go b/distribution/pull.go index 7814be5d2e..32910b9694 100644 --- a/distribution/pull.go +++ b/distribution/pull.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api" "github.com/docker/docker/api/types/events" diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go index e8a17fc2bb..e7e1abda7b 100644 --- a/distribution/pull_v2.go +++ b/distribution/pull_v2.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" diff --git a/distribution/pull_v2_unix.go b/distribution/pull_v2_unix.go index 824b84885e..07b1c69ccc 100644 --- a/distribution/pull_v2_unix.go +++ b/distribution/pull_v2_unix.go @@ -6,8 +6,8 @@ import ( "context" "sort" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/distribution/pull_v2_windows.go b/distribution/pull_v2_windows.go index dd3f87ed4f..b3925eb144 100644 --- a/distribution/pull_v2_windows.go +++ b/distribution/pull_v2_windows.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/Microsoft/hcsshim/osversion" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/distribution/manifest/manifestlist" "github.com/docker/distribution/manifest/schema2" diff --git a/distribution/push.go b/distribution/push.go index b6021fa500..fa4f7c5a12 100644 --- a/distribution/push.go +++ b/distribution/push.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/events" "github.com/docker/docker/pkg/progress" diff --git a/distribution/push_v2.go b/distribution/push_v2.go index 0b8b9c942b..d36667d692 100644 --- a/distribution/push_v2.go +++ b/distribution/push_v2.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/distribution/manifest/schema1" diff --git a/distribution/registry_unit_test.go b/distribution/registry_unit_test.go index 28f3de8904..8de9861494 100644 --- a/distribution/registry_unit_test.go +++ b/distribution/registry_unit_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/registry" registrypkg "github.com/docker/docker/registry" diff --git a/distribution/utils/progress.go b/distribution/utils/progress.go index 43451bec68..2151cf4da6 100644 --- a/distribution/utils/progress.go +++ b/distribution/utils/progress.go @@ -7,7 +7,7 @@ import ( "os" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/progress" "github.com/docker/docker/pkg/streamformatter" ) diff --git a/distribution/xfer/download.go b/distribution/xfer/download.go index 1f3f241eaa..1f8d7c10a7 100644 --- a/distribution/xfer/download.go +++ b/distribution/xfer/download.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/docker/image" "github.com/docker/docker/layer" diff --git a/distribution/xfer/upload.go b/distribution/xfer/upload.go index 247c6eb0de..02231eb7d0 100644 --- a/distribution/xfer/upload.go +++ b/distribution/xfer/upload.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/docker/layer" "github.com/docker/docker/pkg/progress" diff --git a/hack/validate/golangci-lint.yml b/hack/validate/golangci-lint.yml index 379837f77e..89221ec2da 100644 --- a/hack/validate/golangci-lint.yml +++ b/hack/validate/golangci-lint.yml @@ -129,10 +129,6 @@ issues: - text: "SA1019: (assert|cmp|is)\\.ErrorType is deprecated" linters: - staticcheck - # FIXME temporarily suppress deprecation warnings for the logs package. See https://github.com/moby/moby/pull/46611 - - text: "SA1019: log\\.(G|L|Fields|Entry|RFC3339NanoFixed|Level|TraceLevel|DebugLevel|InfoLevel|WarnLevel|ErrorLevel|FatalLevel|PanicLevel|SetLevel|GetLevel|OutputFormat|TextFormat|JSONFormat|SetFormat|WithLogger|GetLogger)" - linters: - - staticcheck # Maximum issues count per one linter. Set to 0 to disable. Default is 50. max-issues-per-linter: 0 diff --git a/image/fs.go b/image/fs.go index 8665bd5c17..83eb6e7775 100644 --- a/image/fs.go +++ b/image/fs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/ioutils" "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/image/rootfs.go b/image/rootfs.go index f971261f45..efccd97eb2 100644 --- a/image/rootfs.go +++ b/image/rootfs.go @@ -4,7 +4,7 @@ import ( "context" "runtime" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/layer" ) diff --git a/image/store.go b/image/store.go index 1ec606a661..41a720bd02 100644 --- a/image/store.go +++ b/image/store.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/layer" "github.com/opencontainers/go-digest" diff --git a/image/tarexport/load.go b/image/tarexport/load.go index 6667b3e085..fe09f7191e 100644 --- a/image/tarexport/load.go +++ b/image/tarexport/load.go @@ -11,7 +11,7 @@ import ( "reflect" "runtime" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution" "github.com/docker/docker/api/types/events" diff --git a/image/v1/imagev1.go b/image/v1/imagev1.go index 8837ae41dc..c3a25bb15c 100644 --- a/image/v1/imagev1.go +++ b/image/v1/imagev1.go @@ -5,7 +5,7 @@ import ( "encoding/json" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/image" "github.com/docker/docker/layer" diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index 60a6341745..a979141110 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/daemon" "github.com/docker/docker/testutil" diff --git a/integration-cli/events_utils_test.go b/integration-cli/events_utils_test.go index dce4c216c5..827ec0f662 100644 --- a/integration-cli/events_utils_test.go +++ b/integration-cli/events_utils_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" eventstestutils "github.com/docker/docker/daemon/events/testutils" "gotest.tools/v3/assert" ) diff --git a/layer/filestore.go b/layer/filestore.go index 4cf4e2fe6a..96ede8711b 100644 --- a/layer/filestore.go +++ b/layer/filestore.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/docker/pkg/ioutils" "github.com/opencontainers/go-digest" diff --git a/layer/layer.go b/layer/layer.go index b5c33b63c1..28ad0fc9c7 100644 --- a/layer/layer.go +++ b/layer/layer.go @@ -14,7 +14,7 @@ import ( "errors" "io" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/docker/pkg/archive" "github.com/opencontainers/go-digest" diff --git a/layer/layer_store.go b/layer/layer_store.go index 396d528199..6c010070c3 100644 --- a/layer/layer_store.go +++ b/layer/layer_store.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/idtools" diff --git a/layer/migration.go b/layer/migration.go index b90c0b4c27..26e1553c65 100644 --- a/layer/migration.go +++ b/layer/migration.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" diff --git a/libcontainerd/local/local_windows.go b/libcontainerd/local/local_windows.go index b72e333548..08125e131e 100644 --- a/libcontainerd/local/local_windows.go +++ b/libcontainerd/local/local_windows.go @@ -19,7 +19,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" cerrdefs "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd/queue" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" diff --git a/libcontainerd/remote/client.go b/libcontainerd/remote/client.go index d3816223e5..f4fc8747f7 100644 --- a/libcontainerd/remote/client.go +++ b/libcontainerd/remote/client.go @@ -21,9 +21,9 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/protobuf" v2runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd/queue" diff --git a/libcontainerd/remote/client_io_windows.go b/libcontainerd/remote/client_io_windows.go index eb9af2f3aa..bbc51a4fc8 100644 --- a/libcontainerd/remote/client_io_windows.go +++ b/libcontainerd/remote/client_io_windows.go @@ -7,7 +7,7 @@ import ( winio "github.com/Microsoft/go-winio" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/pkg/errors" ) diff --git a/libcontainerd/remote/client_linux.go b/libcontainerd/remote/client_linux.go index 5929f07ebf..0c9eb575ca 100644 --- a/libcontainerd/remote/client_linux.go +++ b/libcontainerd/remote/client_linux.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" + "github.com/containerd/log" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/idtools" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/libcontainerd/remote/client_windows.go b/libcontainerd/remote/client_windows.go index 76a75be918..39be66abff 100644 --- a/libcontainerd/remote/client_windows.go +++ b/libcontainerd/remote/client_windows.go @@ -10,7 +10,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" - "github.com/containerd/containerd/log" + "github.com/containerd/log" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/libcontainerd/replace.go b/libcontainerd/replace.go index fd4f25d52b..3424205f0d 100644 --- a/libcontainerd/replace.go +++ b/libcontainerd/replace.go @@ -4,7 +4,7 @@ import ( "context" "github.com/containerd/containerd" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go index dda99bf36c..252eb12397 100644 --- a/libcontainerd/supervisor/remote_daemon.go +++ b/libcontainerd/supervisor/remote_daemon.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/services/server/config" "github.com/containerd/containerd/sys" + "github.com/containerd/log" "github.com/docker/docker/pkg/pidfile" "github.com/docker/docker/pkg/process" "github.com/docker/docker/pkg/system" diff --git a/libcontainerd/supervisor/remote_daemon_options.go b/libcontainerd/supervisor/remote_daemon_options.go index 6593fabc73..afd7874201 100644 --- a/libcontainerd/supervisor/remote_daemon_options.go +++ b/libcontainerd/supervisor/remote_daemon_options.go @@ -1,7 +1,7 @@ package supervisor // import "github.com/docker/docker/libcontainerd/supervisor" import ( - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // WithLogLevel defines which log level to start containerd with. diff --git a/libnetwork/agent.go b/libnetwork/agent.go index bd7ae8ce50..ab566b2edb 100644 --- a/libnetwork/agent.go +++ b/libnetwork/agent.go @@ -10,7 +10,7 @@ import ( "sort" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/cluster" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" diff --git a/libnetwork/cmd/diagnostic/main.go b/libnetwork/cmd/diagnostic/main.go index cdd2c00121..d57bd1e676 100644 --- a/libnetwork/cmd/diagnostic/main.go +++ b/libnetwork/cmd/diagnostic/main.go @@ -12,7 +12,7 @@ import ( "os" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork" "github.com/docker/docker/libnetwork/diagnostic" "github.com/docker/docker/libnetwork/drivers/overlay" diff --git a/libnetwork/cmd/networkdb-test/dbclient/ndbClient.go b/libnetwork/cmd/networkdb-test/dbclient/ndbClient.go index 126f7d888f..f993190537 100644 --- a/libnetwork/cmd/networkdb-test/dbclient/ndbClient.go +++ b/libnetwork/cmd/networkdb-test/dbclient/ndbClient.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) var servicePort string diff --git a/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go b/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go index 68db9cac51..1a95d8d7f4 100644 --- a/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go +++ b/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go @@ -9,7 +9,7 @@ import ( "os" "strconv" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/cmd/networkdb-test/dummyclient" "github.com/docker/docker/libnetwork/diagnostic" "github.com/docker/docker/libnetwork/networkdb" diff --git a/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go b/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go index 3477296670..e645cb9385 100644 --- a/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go +++ b/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/diagnostic" "github.com/docker/docker/libnetwork/networkdb" events "github.com/docker/go-events" diff --git a/libnetwork/cmd/networkdb-test/testMain.go b/libnetwork/cmd/networkdb-test/testMain.go index f2ef347a3c..3edb67847f 100644 --- a/libnetwork/cmd/networkdb-test/testMain.go +++ b/libnetwork/cmd/networkdb-test/testMain.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/cmd/networkdb-test/dbclient" "github.com/docker/docker/libnetwork/cmd/networkdb-test/dbserver" ) diff --git a/libnetwork/config/config.go b/libnetwork/config/config.go index 0348b91df8..efd530b794 100644 --- a/libnetwork/config/config.go +++ b/libnetwork/config/config.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/cluster" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/ipamutils" diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 7c26a2567e..b5afe47f51 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -53,7 +53,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/cluster" "github.com/docker/docker/libnetwork/config" "github.com/docker/docker/libnetwork/datastore" diff --git a/libnetwork/controller_linux.go b/libnetwork/controller_linux.go index b0c8cfe34f..502c9c22d1 100644 --- a/libnetwork/controller_linux.go +++ b/libnetwork/controller_linux.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/options" diff --git a/libnetwork/default_gateway.go b/libnetwork/default_gateway.go index 776696b7a4..8e7b9981bd 100644 --- a/libnetwork/default_gateway.go +++ b/libnetwork/default_gateway.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/diagnostic/server.go b/libnetwork/diagnostic/server.go index 42bf37459f..d8bcaf49b5 100644 --- a/libnetwork/diagnostic/server.go +++ b/libnetwork/diagnostic/server.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/internal/caller" "github.com/docker/docker/pkg/stack" ) diff --git a/libnetwork/drivers/bridge/bridge_linux.go b/libnetwork/drivers/bridge/bridge_linux.go index 0720298549..e9e1f9ac44 100644 --- a/libnetwork/drivers/bridge/bridge_linux.go +++ b/libnetwork/drivers/bridge/bridge_linux.go @@ -10,7 +10,7 @@ import ( "strconv" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/iptables" diff --git a/libnetwork/drivers/bridge/bridge_store.go b/libnetwork/drivers/bridge/bridge_store.go index 6969e6bffa..713cd42de7 100644 --- a/libnetwork/drivers/bridge/bridge_store.go +++ b/libnetwork/drivers/bridge/bridge_store.go @@ -8,7 +8,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/bridge/interface_linux.go b/libnetwork/drivers/bridge/interface_linux.go index 55637ee07b..6618fd66bd 100644 --- a/libnetwork/drivers/bridge/interface_linux.go +++ b/libnetwork/drivers/bridge/interface_linux.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/bridge/link.go b/libnetwork/drivers/bridge/link.go index 571372b349..3b54415485 100644 --- a/libnetwork/drivers/bridge/link.go +++ b/libnetwork/drivers/bridge/link.go @@ -7,7 +7,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/bridge/port_mapping_linux.go b/libnetwork/drivers/bridge/port_mapping_linux.go index 6d4dd40713..d9b95490d7 100644 --- a/libnetwork/drivers/bridge/port_mapping_linux.go +++ b/libnetwork/drivers/bridge/port_mapping_linux.go @@ -8,7 +8,7 @@ import ( "net" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/ishidawataru/sctp" ) diff --git a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go index 4d7bf8efcb..b9db98d7f6 100644 --- a/libnetwork/drivers/bridge/setup_bridgenetfiltering.go +++ b/libnetwork/drivers/bridge/setup_bridgenetfiltering.go @@ -9,7 +9,7 @@ import ( "os" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // Enumeration type saying which versions of IP protocol to process. diff --git a/libnetwork/drivers/bridge/setup_device_linux.go b/libnetwork/drivers/bridge/setup_device_linux.go index 1f499bc14e..a90b8cea1d 100644 --- a/libnetwork/drivers/bridge/setup_device_linux.go +++ b/libnetwork/drivers/bridge/setup_device_linux.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/netutils" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding.go b/libnetwork/drivers/bridge/setup_ip_forwarding.go index 73853385bd..a29ac07785 100644 --- a/libnetwork/drivers/bridge/setup_ip_forwarding.go +++ b/libnetwork/drivers/bridge/setup_ip_forwarding.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" ) diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go index 5d2289014b..82483e0669 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables_linux.go +++ b/libnetwork/drivers/bridge/setup_ip_tables_linux.go @@ -6,7 +6,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" diff --git a/libnetwork/drivers/bridge/setup_ipv4_linux.go b/libnetwork/drivers/bridge/setup_ipv4_linux.go index b295782ba4..30096014e7 100644 --- a/libnetwork/drivers/bridge/setup_ipv4_linux.go +++ b/libnetwork/drivers/bridge/setup_ipv4_linux.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/bridge/setup_ipv6_linux.go b/libnetwork/drivers/bridge/setup_ipv6_linux.go index 092dfeb477..6cc12926fe 100644 --- a/libnetwork/drivers/bridge/setup_ipv6_linux.go +++ b/libnetwork/drivers/bridge/setup_ipv6_linux.go @@ -6,7 +6,7 @@ import ( "net" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/bridge/setup_verify_linux.go b/libnetwork/drivers/bridge/setup_verify_linux.go index 8bfc4e20b0..c05fa7e242 100644 --- a/libnetwork/drivers/bridge/setup_verify_linux.go +++ b/libnetwork/drivers/bridge/setup_verify_linux.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" diff --git a/libnetwork/drivers/ipvlan/ipvlan_endpoint.go b/libnetwork/drivers/ipvlan/ipvlan_endpoint.go index fa772ab49c..9d519f9b6d 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_endpoint.go +++ b/libnetwork/drivers/ipvlan/ipvlan_endpoint.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/ipvlan/ipvlan_joinleave.go b/libnetwork/drivers/ipvlan/ipvlan_joinleave.go index ac7fe93dfd..f00e279969 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_joinleave.go +++ b/libnetwork/drivers/ipvlan/ipvlan_joinleave.go @@ -7,7 +7,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/ipvlan/ipvlan_network.go b/libnetwork/drivers/ipvlan/ipvlan_network.go index 11e7868608..1121c68bf7 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_network.go +++ b/libnetwork/drivers/ipvlan/ipvlan_network.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/ipvlan/ipvlan_setup.go b/libnetwork/drivers/ipvlan/ipvlan_setup.go index 08ec727fb7..423f6dbd44 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_setup.go +++ b/libnetwork/drivers/ipvlan/ipvlan_setup.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ns" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/ipvlan/ipvlan_state.go b/libnetwork/drivers/ipvlan/ipvlan_state.go index 8816f64243..1b94ea9910 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_state.go +++ b/libnetwork/drivers/ipvlan/ipvlan_state.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/ipvlan/ipvlan_store.go b/libnetwork/drivers/ipvlan/ipvlan_store.go index 5b2dfe5a9c..0d13c49446 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_store.go +++ b/libnetwork/drivers/ipvlan/ipvlan_store.go @@ -8,7 +8,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/macvlan/macvlan_endpoint.go b/libnetwork/drivers/macvlan/macvlan_endpoint.go index ec9ceda3fe..5ca8441b88 100644 --- a/libnetwork/drivers/macvlan/macvlan_endpoint.go +++ b/libnetwork/drivers/macvlan/macvlan_endpoint.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/netutils" diff --git a/libnetwork/drivers/macvlan/macvlan_joinleave.go b/libnetwork/drivers/macvlan/macvlan_joinleave.go index 2531d65a9c..ed32ddc739 100644 --- a/libnetwork/drivers/macvlan/macvlan_joinleave.go +++ b/libnetwork/drivers/macvlan/macvlan_joinleave.go @@ -7,7 +7,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/macvlan/macvlan_network.go b/libnetwork/drivers/macvlan/macvlan_network.go index ce00f1033b..6f02ee8d67 100644 --- a/libnetwork/drivers/macvlan/macvlan_network.go +++ b/libnetwork/drivers/macvlan/macvlan_network.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/macvlan/macvlan_setup.go b/libnetwork/drivers/macvlan/macvlan_setup.go index 4b8f22c7c0..84279ac0e3 100644 --- a/libnetwork/drivers/macvlan/macvlan_setup.go +++ b/libnetwork/drivers/macvlan/macvlan_setup.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ns" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/drivers/macvlan/macvlan_state.go b/libnetwork/drivers/macvlan/macvlan_state.go index ef5aad1017..731db6251a 100644 --- a/libnetwork/drivers/macvlan/macvlan_state.go +++ b/libnetwork/drivers/macvlan/macvlan_state.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/macvlan/macvlan_store.go b/libnetwork/drivers/macvlan/macvlan_store.go index f4b0f47ac7..432e08badc 100644 --- a/libnetwork/drivers/macvlan/macvlan_store.go +++ b/libnetwork/drivers/macvlan/macvlan_store.go @@ -8,7 +8,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/overlay/encryption.go b/libnetwork/drivers/overlay/encryption.go index bc1efd9bee..e2eefbeeb2 100644 --- a/libnetwork/drivers/overlay/encryption.go +++ b/libnetwork/drivers/overlay/encryption.go @@ -14,7 +14,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" "github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/overlay/joinleave.go b/libnetwork/drivers/overlay/joinleave.go index 71f8fd37f8..26c8e8aea7 100644 --- a/libnetwork/drivers/overlay/joinleave.go +++ b/libnetwork/drivers/overlay/joinleave.go @@ -8,7 +8,7 @@ import ( "net" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/osl" diff --git a/libnetwork/drivers/overlay/ov_endpoint.go b/libnetwork/drivers/overlay/ov_endpoint.go index ba71a85ab4..7351bfd660 100644 --- a/libnetwork/drivers/overlay/ov_endpoint.go +++ b/libnetwork/drivers/overlay/ov_endpoint.go @@ -7,7 +7,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go index 1dbe9df39b..2e475152a0 100644 --- a/libnetwork/drivers/overlay/ov_network.go +++ b/libnetwork/drivers/overlay/ov_network.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/overlay/ov_utils.go b/libnetwork/drivers/overlay/ov_utils.go index e45b1a9396..46b61b6dee 100644 --- a/libnetwork/drivers/overlay/ov_utils.go +++ b/libnetwork/drivers/overlay/ov_utils.go @@ -7,7 +7,7 @@ import ( "fmt" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" "github.com/docker/docker/libnetwork/netutils" "github.com/docker/docker/libnetwork/ns" diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go index 0bc4d8b09b..93082422e2 100644 --- a/libnetwork/drivers/overlay/overlay.go +++ b/libnetwork/drivers/overlay/overlay.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/scope" diff --git a/libnetwork/drivers/overlay/ovmanager/ovmanager.go b/libnetwork/drivers/overlay/ovmanager/ovmanager.go index ab6193f449..ba46f3b5b4 100644 --- a/libnetwork/drivers/overlay/ovmanager/ovmanager.go +++ b/libnetwork/drivers/overlay/ovmanager/ovmanager.go @@ -7,7 +7,7 @@ import ( "strconv" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/bitmap" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/drivers/overlay/overlayutils" diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go index 8a6385d8da..c636201e24 100644 --- a/libnetwork/drivers/overlay/peerdb.go +++ b/libnetwork/drivers/overlay/peerdb.go @@ -9,7 +9,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/internal/setmatrix" "github.com/docker/docker/libnetwork/osl" ) diff --git a/libnetwork/drivers/remote/driver.go b/libnetwork/drivers/remote/driver.go index f9932263a6..a4d581c9fe 100644 --- a/libnetwork/drivers/remote/driver.go +++ b/libnetwork/drivers/remote/driver.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/drivers/remote/api" diff --git a/libnetwork/drivers/windows/overlay/joinleave_windows.go b/libnetwork/drivers/windows/overlay/joinleave_windows.go index b8dfe978de..406824a46e 100644 --- a/libnetwork/drivers/windows/overlay/joinleave_windows.go +++ b/libnetwork/drivers/windows/overlay/joinleave_windows.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/types" "github.com/gogo/protobuf/proto" diff --git a/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go b/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go index bfb7f1564b..41f7c992f8 100644 --- a/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go +++ b/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go @@ -9,7 +9,7 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/osversion" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/drivers/windows" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/windows/overlay/ov_network_windows.go b/libnetwork/drivers/windows/overlay/ov_network_windows.go index a5ec7f54b9..a0a7cc43e7 100644 --- a/libnetwork/drivers/windows/overlay/ov_network_windows.go +++ b/libnetwork/drivers/windows/overlay/ov_network_windows.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" "github.com/docker/docker/libnetwork/portmapper" diff --git a/libnetwork/drivers/windows/overlay/overlay_windows.go b/libnetwork/drivers/windows/overlay/overlay_windows.go index 43392672ac..fa737edcd0 100644 --- a/libnetwork/drivers/windows/overlay/overlay_windows.go +++ b/libnetwork/drivers/windows/overlay/overlay_windows.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/scope" ) diff --git a/libnetwork/drivers/windows/overlay/peerdb_windows.go b/libnetwork/drivers/windows/overlay/peerdb_windows.go index 0e6cc7dbf3..befe1ccd87 100644 --- a/libnetwork/drivers/windows/overlay/peerdb_windows.go +++ b/libnetwork/drivers/windows/overlay/peerdb_windows.go @@ -7,7 +7,7 @@ import ( "net" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/drivers/windows/port_mapping.go b/libnetwork/drivers/windows/port_mapping.go index ca27eeede6..73c95e46fe 100644 --- a/libnetwork/drivers/windows/port_mapping.go +++ b/libnetwork/drivers/windows/port_mapping.go @@ -9,7 +9,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/portmapper" "github.com/docker/docker/libnetwork/types" "github.com/ishidawataru/sctp" diff --git a/libnetwork/drivers/windows/windows.go b/libnetwork/drivers/windows/windows.go index 0258cc3051..32e8c67099 100644 --- a/libnetwork/drivers/windows/windows.go +++ b/libnetwork/drivers/windows/windows.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/drivers/windows/windows_store.go b/libnetwork/drivers/windows/windows_store.go index 62082bbcd9..c647838d4f 100644 --- a/libnetwork/drivers/windows/windows_store.go +++ b/libnetwork/drivers/windows/windows_store.go @@ -8,7 +8,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/discoverapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go index 7492e9fb30..6e9315bac8 100644 --- a/libnetwork/endpoint.go +++ b/libnetwork/endpoint.go @@ -7,7 +7,7 @@ import ( "net" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/netlabel" diff --git a/libnetwork/firewall_linux.go b/libnetwork/firewall_linux.go index 1ea7cee022..42eef3e553 100644 --- a/libnetwork/firewall_linux.go +++ b/libnetwork/firewall_linux.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" ) diff --git a/libnetwork/ipam/allocator.go b/libnetwork/ipam/allocator.go index 544a600c82..e38ca7fd71 100644 --- a/libnetwork/ipam/allocator.go +++ b/libnetwork/ipam/allocator.go @@ -7,7 +7,7 @@ import ( "net/netip" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/bitmap" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipbits" diff --git a/libnetwork/ipams/remote/remote.go b/libnetwork/ipams/remote/remote.go index 55031ff5e1..0eef5432b0 100644 --- a/libnetwork/ipams/remote/remote.go +++ b/libnetwork/ipams/remote/remote.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipams/remote/api" "github.com/docker/docker/libnetwork/types" diff --git a/libnetwork/ipams/windowsipam/windowsipam.go b/libnetwork/ipams/windowsipam/windowsipam.go index be112d70bc..d8f37e01a7 100644 --- a/libnetwork/ipams/windowsipam/windowsipam.go +++ b/libnetwork/ipams/windowsipam/windowsipam.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/iptables/conntrack.go b/libnetwork/iptables/conntrack.go index d4cfa02d28..c77993e105 100644 --- a/libnetwork/iptables/conntrack.go +++ b/libnetwork/iptables/conntrack.go @@ -8,7 +8,7 @@ import ( "net" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/iptables/firewalld.go b/libnetwork/iptables/firewalld.go index fd792d43f7..dc67240da6 100644 --- a/libnetwork/iptables/firewalld.go +++ b/libnetwork/iptables/firewalld.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" dbus "github.com/godbus/dbus/v5" ) diff --git a/libnetwork/iptables/iptables.go b/libnetwork/iptables/iptables.go index 0c845fc36d..27c68be233 100644 --- a/libnetwork/iptables/iptables.go +++ b/libnetwork/iptables/iptables.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/rootless" ) diff --git a/libnetwork/libnetwork_linux_test.go b/libnetwork/libnetwork_linux_test.go index 072164bb7d..0fcc41596a 100644 --- a/libnetwork/libnetwork_linux_test.go +++ b/libnetwork/libnetwork_linux_test.go @@ -15,7 +15,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/internal/testutils/netnsutils" "github.com/docker/docker/libnetwork" "github.com/docker/docker/libnetwork/config" diff --git a/libnetwork/network.go b/libnetwork/network.go index c0799ad959..f8799ea567 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/driverapi" "github.com/docker/docker/libnetwork/etchosts" diff --git a/libnetwork/network_windows.go b/libnetwork/network_windows.go index 1d2e31dcb7..ae8ddefebb 100644 --- a/libnetwork/network_windows.go +++ b/libnetwork/network_windows.go @@ -8,7 +8,7 @@ import ( "time" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/drivers/windows" "github.com/docker/docker/libnetwork/ipamapi" "github.com/docker/docker/libnetwork/ipams/windowsipam" diff --git a/libnetwork/networkdb/cluster.go b/libnetwork/networkdb/cluster.go index 7860dc6195..f04ac7ecc2 100644 --- a/libnetwork/networkdb/cluster.go +++ b/libnetwork/networkdb/cluster.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/hashicorp/memberlist" ) diff --git a/libnetwork/networkdb/delegate.go b/libnetwork/networkdb/delegate.go index 74abdfe6f6..c891d411fe 100644 --- a/libnetwork/networkdb/delegate.go +++ b/libnetwork/networkdb/delegate.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/gogo/protobuf/proto" ) diff --git a/libnetwork/networkdb/event_delegate.go b/libnetwork/networkdb/event_delegate.go index 6cb52e3651..7c436f0670 100644 --- a/libnetwork/networkdb/event_delegate.go +++ b/libnetwork/networkdb/event_delegate.go @@ -5,7 +5,7 @@ import ( "encoding/json" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/hashicorp/memberlist" ) diff --git a/libnetwork/networkdb/networkdb.go b/libnetwork/networkdb/networkdb.go index d83f57375b..66c0b81744 100644 --- a/libnetwork/networkdb/networkdb.go +++ b/libnetwork/networkdb/networkdb.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/docker/docker/pkg/stringid" "github.com/docker/go-events" diff --git a/libnetwork/networkdb/networkdb_test.go b/libnetwork/networkdb/networkdb_test.go index 9811428a07..2f6287f0a9 100644 --- a/libnetwork/networkdb/networkdb_test.go +++ b/libnetwork/networkdb/networkdb_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/stringid" "github.com/docker/go-events" "github.com/hashicorp/memberlist" diff --git a/libnetwork/networkdb/networkdbdiagnostic.go b/libnetwork/networkdb/networkdbdiagnostic.go index 3ddfa78cc9..a23be599bb 100644 --- a/libnetwork/networkdb/networkdbdiagnostic.go +++ b/libnetwork/networkdb/networkdbdiagnostic.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/diagnostic" "github.com/docker/docker/libnetwork/internal/caller" ) diff --git a/libnetwork/networkdb/nodemgmt.go b/libnetwork/networkdb/nodemgmt.go index 018ff74310..71105e5e4c 100644 --- a/libnetwork/networkdb/nodemgmt.go +++ b/libnetwork/networkdb/nodemgmt.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/hashicorp/memberlist" ) diff --git a/libnetwork/ns/init_linux.go b/libnetwork/ns/init_linux.go index ed721c6264..66bc67c603 100644 --- a/libnetwork/ns/init_linux.go +++ b/libnetwork/ns/init_linux.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" ) diff --git a/libnetwork/osl/interface_linux.go b/libnetwork/osl/interface_linux.go index baa0923eab..27e079d1b9 100644 --- a/libnetwork/osl/interface_linux.go +++ b/libnetwork/osl/interface_linux.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/types" "github.com/vishvananda/netlink" diff --git a/libnetwork/osl/kernel/knobs_linux.go b/libnetwork/osl/kernel/knobs_linux.go index b94f1694ce..81ad174265 100644 --- a/libnetwork/osl/kernel/knobs_linux.go +++ b/libnetwork/osl/kernel/knobs_linux.go @@ -6,7 +6,7 @@ import ( "path" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // writeSystemProperty writes the value to a path under /proc/sys as determined from the key. diff --git a/libnetwork/osl/kernel/knobs_linux_test.go b/libnetwork/osl/kernel/knobs_linux_test.go index 70428bfc82..c1e2163570 100644 --- a/libnetwork/osl/kernel/knobs_linux_test.go +++ b/libnetwork/osl/kernel/knobs_linux_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" ) diff --git a/libnetwork/osl/namespace_linux.go b/libnetwork/osl/namespace_linux.go index 73270662b7..1ea66b65cb 100644 --- a/libnetwork/osl/namespace_linux.go +++ b/libnetwork/osl/namespace_linux.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/internal/unshare" "github.com/docker/docker/libnetwork/ns" "github.com/docker/docker/libnetwork/osl/kernel" diff --git a/libnetwork/osl/neigh_linux.go b/libnetwork/osl/neigh_linux.go index 94a3141c67..c5dab0b8a3 100644 --- a/libnetwork/osl/neigh_linux.go +++ b/libnetwork/osl/neigh_linux.go @@ -8,7 +8,7 @@ import ( "net" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/vishvananda/netlink" ) diff --git a/libnetwork/portallocator/portallocator.go b/libnetwork/portallocator/portallocator.go index bf8723fc12..427e9f6f86 100644 --- a/libnetwork/portallocator/portallocator.go +++ b/libnetwork/portallocator/portallocator.go @@ -7,7 +7,7 @@ import ( "net" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type ipMapping map[string]protoMap diff --git a/libnetwork/portmapper/mapper.go b/libnetwork/portmapper/mapper.go index f7bd9f8c83..25664348bb 100644 --- a/libnetwork/portmapper/mapper.go +++ b/libnetwork/portmapper/mapper.go @@ -6,7 +6,7 @@ import ( "fmt" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/portallocator" "github.com/ishidawataru/sctp" ) diff --git a/libnetwork/resolvconf/resolvconf.go b/libnetwork/resolvconf/resolvconf.go index 90dd129c7e..da20e1c031 100644 --- a/libnetwork/resolvconf/resolvconf.go +++ b/libnetwork/resolvconf/resolvconf.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const ( diff --git a/libnetwork/resolver.go b/libnetwork/resolver.go index f47c2e3036..9c84ddbcfb 100644 --- a/libnetwork/resolver.go +++ b/libnetwork/resolver.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/miekg/dns" "go.opentelemetry.io/otel" diff --git a/libnetwork/resolver_test.go b/libnetwork/resolver_test.go index b3660bc133..ec618b616a 100644 --- a/libnetwork/resolver_test.go +++ b/libnetwork/resolver_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/internal/testutils/netnsutils" "github.com/miekg/dns" "github.com/sirupsen/logrus" diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go index 36318e2858..86c4701770 100644 --- a/libnetwork/sandbox.go +++ b/libnetwork/sandbox.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/etchosts" "github.com/docker/docker/libnetwork/osl" "github.com/docker/docker/libnetwork/types" diff --git a/libnetwork/sandbox_dns_unix.go b/libnetwork/sandbox_dns_unix.go index 9f5bcb3211..e30f394057 100644 --- a/libnetwork/sandbox_dns_unix.go +++ b/libnetwork/sandbox_dns_unix.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/etchosts" "github.com/docker/docker/libnetwork/resolvconf" "github.com/docker/docker/libnetwork/types" diff --git a/libnetwork/sandbox_externalkey_unix.go b/libnetwork/sandbox_externalkey_unix.go index 99aec0926f..9dc82ef877 100644 --- a/libnetwork/sandbox_externalkey_unix.go +++ b/libnetwork/sandbox_externalkey_unix.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/types" "github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/stringid" diff --git a/libnetwork/sandbox_linux.go b/libnetwork/sandbox_linux.go index 4d5b647756..fc3bbb3447 100644 --- a/libnetwork/sandbox_linux.go +++ b/libnetwork/sandbox_linux.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/osl" "github.com/docker/docker/libnetwork/types" ) diff --git a/libnetwork/sandbox_store.go b/libnetwork/sandbox_store.go index 87eeb4a8eb..a37f5635df 100644 --- a/libnetwork/sandbox_store.go +++ b/libnetwork/sandbox_store.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/osl" "github.com/docker/docker/libnetwork/scope" diff --git a/libnetwork/service_common.go b/libnetwork/service_common.go index 0cf9a52ebe..266816e1a6 100644 --- a/libnetwork/service_common.go +++ b/libnetwork/service_common.go @@ -6,7 +6,7 @@ import ( "context" "net" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) const maxSetStringLen = 350 diff --git a/libnetwork/service_linux.go b/libnetwork/service_linux.go index c08dccc217..758ec8c18e 100644 --- a/libnetwork/service_linux.go +++ b/libnetwork/service_linux.go @@ -12,7 +12,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/iptables" "github.com/docker/docker/libnetwork/ns" "github.com/ishidawataru/sctp" diff --git a/libnetwork/service_windows.go b/libnetwork/service_windows.go index a501449b72..94def52dbc 100644 --- a/libnetwork/service_windows.go +++ b/libnetwork/service_windows.go @@ -5,7 +5,7 @@ import ( "net" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type policyLists struct { diff --git a/libnetwork/store.go b/libnetwork/store.go index e1190628c1..68285e560d 100644 --- a/libnetwork/store.go +++ b/libnetwork/store.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/libnetwork/datastore" "github.com/docker/docker/libnetwork/scope" ) diff --git a/oci/caps/utils_linux.go b/oci/caps/utils_linux.go index ad9c015246..ffb301cf81 100644 --- a/oci/caps/utils_linux.go +++ b/oci/caps/utils_linux.go @@ -3,8 +3,8 @@ import ( "context" "sync" - "github.com/containerd/containerd/log" ccaps "github.com/containerd/containerd/pkg/cap" + "github.com/containerd/log" ) var initCapsOnce sync.Once diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 3198b60ca8..fb42864b6b 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -20,8 +20,8 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/pools" diff --git a/pkg/archive/changes.go b/pkg/archive/changes.go index 6faed13672..f9f16c9259 100644 --- a/pkg/archive/changes.go +++ b/pkg/archive/changes.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/system" diff --git a/pkg/archive/copy.go b/pkg/archive/copy.go index 7a5a16c821..01eadc30d9 100644 --- a/pkg/archive/copy.go +++ b/pkg/archive/copy.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/system" ) diff --git a/pkg/archive/diff.go b/pkg/archive/diff.go index 56d07f1dcf..318f594212 100644 --- a/pkg/archive/diff.go +++ b/pkg/archive/diff.go @@ -10,7 +10,7 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/system" ) diff --git a/pkg/archive/example_changes.go b/pkg/archive/example_changes.go index 75786bce85..44ad1ee2da 100644 --- a/pkg/archive/example_changes.go +++ b/pkg/archive/example_changes.go @@ -12,7 +12,7 @@ import ( "os" "path" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/archive" ) diff --git a/pkg/authorization/authz.go b/pkg/authorization/authz.go index f1680c89ad..1eb44315dd 100644 --- a/pkg/authorization/authz.go +++ b/pkg/authorization/authz.go @@ -10,7 +10,7 @@ import ( "net/http" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/ioutils" ) diff --git a/pkg/authorization/middleware.go b/pkg/authorization/middleware.go index e39698ae76..8a55b27cbd 100644 --- a/pkg/authorization/middleware.go +++ b/pkg/authorization/middleware.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/plugingetter" ) diff --git a/pkg/authorization/response.go b/pkg/authorization/response.go index 735b397e7a..55e218adb7 100644 --- a/pkg/authorization/response.go +++ b/pkg/authorization/response.go @@ -9,7 +9,7 @@ import ( "net" "net/http" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // ResponseModifier allows authorization plugins to read and modify the content of the http.response diff --git a/pkg/fileutils/fileutils_linux.go b/pkg/fileutils/fileutils_linux.go index d8cd495f3f..e08d1bfbab 100644 --- a/pkg/fileutils/fileutils_linux.go +++ b/pkg/fileutils/fileutils_linux.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/loopback/attach_loopback.go b/pkg/loopback/attach_loopback.go index 7c1272a84b..2fe6528a35 100644 --- a/pkg/loopback/attach_loopback.go +++ b/pkg/loopback/attach_loopback.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/loopback/loopback.go b/pkg/loopback/loopback.go index 4b0eefc745..b3109713f8 100644 --- a/pkg/loopback/loopback.go +++ b/pkg/loopback/loopback.go @@ -11,7 +11,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/parsers/kernel/kernel_unix.go b/pkg/parsers/kernel/kernel_unix.go index f8657535f5..9b49e5c55e 100644 --- a/pkg/parsers/kernel/kernel_unix.go +++ b/pkg/parsers/kernel/kernel_unix.go @@ -5,7 +5,7 @@ package kernel // import "github.com/docker/docker/pkg/parsers/kernel" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go index 875c5fe20f..1a52226670 100644 --- a/pkg/platform/platform.go +++ b/pkg/platform/platform.go @@ -5,7 +5,7 @@ package platform // import "github.com/docker/docker/pkg/platform" import ( "context" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) // Architecture holds the runtime architecture of the process. diff --git a/pkg/plugins/client.go b/pkg/plugins/client.go index 4cde40da68..f7756f2097 100644 --- a/pkg/plugins/client.go +++ b/pkg/plugins/client.go @@ -9,7 +9,7 @@ import ( "net/url" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/plugins/transport" "github.com/docker/go-connections/sockets" diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 422434e5df..2efd8508bf 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/go-connections/tlsconfig" ) diff --git a/pkg/rootless/specconv/specconv_linux.go b/pkg/rootless/specconv/specconv_linux.go index 9a8db2da01..c9a70fb85c 100644 --- a/pkg/rootless/specconv/specconv_linux.go +++ b/pkg/rootless/specconv/specconv_linux.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/sysinfo/cgroup2_linux.go b/pkg/sysinfo/cgroup2_linux.go index c2b60f3d49..2290c2ce8b 100644 --- a/pkg/sysinfo/cgroup2_linux.go +++ b/pkg/sysinfo/cgroup2_linux.go @@ -8,8 +8,8 @@ import ( "github.com/containerd/cgroups/v3" cgroupsV2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" ) func newV2(options ...Opt) *SysInfo { diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go index 377615c0ca..59bf0d278a 100644 --- a/pkg/sysinfo/sysinfo_linux.go +++ b/pkg/sysinfo/sysinfo_linux.go @@ -10,8 +10,8 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/seccomp" + "github.com/containerd/log" "github.com/moby/sys/mountinfo" ) diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go index 5d4242bebc..6ea0ecd14e 100644 --- a/plugin/backend_linux.go +++ b/plugin/backend_linux.go @@ -16,10 +16,10 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/distribution/manifest/schema2" "github.com/docker/docker/api/types" diff --git a/plugin/executor/containerd/containerd.go b/plugin/executor/containerd/containerd.go index b800d1cf3a..7ea01b7985 100644 --- a/plugin/executor/containerd/containerd.go +++ b/plugin/executor/containerd/containerd.go @@ -9,7 +9,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" diff --git a/plugin/fetch_linux.go b/plugin/fetch_linux.go index 08f2b25d8f..1308066303 100644 --- a/plugin/fetch_linux.go +++ b/plugin/fetch_linux.go @@ -9,9 +9,9 @@ import ( "github.com/containerd/containerd/content" cerrdefs "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/registry" progressutils "github.com/docker/docker/distribution/utils" diff --git a/plugin/manager.go b/plugin/manager.go index a3e3902650..81f3d67b80 100644 --- a/plugin/manager.go +++ b/plugin/manager.go @@ -15,7 +15,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/content/local" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/pkg/authorization" diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go index 1820e3fc72..f2cb1aa4e2 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -9,7 +9,7 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/daemon/initlayer" "github.com/docker/docker/errdefs" diff --git a/plugin/registry.go b/plugin/registry.go index e487317ee7..f6921332b6 100644 --- a/plugin/registry.go +++ b/plugin/registry.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/remotes" "github.com/containerd/containerd/remotes/docker" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/dockerversion" diff --git a/plugin/store.go b/plugin/store.go index a1859b1d92..7499d5d6c9 100644 --- a/plugin/store.go +++ b/plugin/store.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/plugingetter" diff --git a/quota/projectquota.go b/quota/projectquota.go index a0f6f442e0..add62fee64 100644 --- a/quota/projectquota.go +++ b/quota/projectquota.go @@ -60,8 +60,8 @@ import ( "sync" "unsafe" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/userns" + "github.com/containerd/log" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/registry/auth.go b/registry/auth.go index bf1cc65f78..f685892c1f 100644 --- a/registry/auth.go +++ b/registry/auth.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth/challenge" "github.com/docker/distribution/registry/client/transport" diff --git a/registry/config.go b/registry/config.go index 347e7128c4..b1e3afe36c 100644 --- a/registry/config.go +++ b/registry/config.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/registry" ) diff --git a/registry/registry.go b/registry/registry.go index 9b42d9fe95..7866dcd0d8 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution/registry/client/transport" "github.com/docker/go-connections/tlsconfig" ) diff --git a/registry/registry_mock_test.go b/registry/registry_mock_test.go index 3719254784..5d76954e04 100644 --- a/registry/registry_mock_test.go +++ b/registry/registry_mock_test.go @@ -10,7 +10,7 @@ import ( "net/http/httptest" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/registry" "gotest.tools/v3/assert" ) diff --git a/registry/resumable/resumablerequestreader.go b/registry/resumable/resumablerequestreader.go index b52459d739..7b8e332d39 100644 --- a/registry/resumable/resumablerequestreader.go +++ b/registry/resumable/resumablerequestreader.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) type requestReader struct { diff --git a/registry/search.go b/registry/search.go index 8324203fc4..75a5444109 100644 --- a/registry/search.go +++ b/registry/search.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution/registry/client/auth" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/registry" diff --git a/registry/search_endpoint_v1.go b/registry/search_endpoint_v1.go index 015f8eb0c6..f6c369a93b 100644 --- a/registry/search_endpoint_v1.go +++ b/registry/search_endpoint_v1.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/distribution/registry/client/transport" "github.com/docker/docker/api/types/registry" ) diff --git a/registry/search_session.go b/registry/search_session.go index 4b051ed4be..c334143c6b 100644 --- a/registry/search_session.go +++ b/registry/search_session.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/ioutils" diff --git a/registry/service.go b/registry/service.go index f60b48f5f2..6881c11057 100644 --- a/registry/service.go +++ b/registry/service.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/distribution/reference" "github.com/docker/docker/api/types/registry" "github.com/docker/docker/errdefs" diff --git a/testutil/helpers.go b/testutil/helpers.go index f00aba8a29..451fcf2cd3 100644 --- a/testutil/helpers.go +++ b/testutil/helpers.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" @@ -32,9 +32,7 @@ func (d devZero) Read(p []byte) (n int, err error) { return len(p), nil } -var ( - tracingOnce sync.Once -) +var tracingOnce sync.Once // configureTracing sets up an OTLP tracing exporter for use in tests. func ConfigureTracing() func(context.Context) { diff --git a/vendor.mod b/vendor.mod index 43f714d12c..0dc3ebdee7 100644 --- a/vendor.mod +++ b/vendor.mod @@ -29,6 +29,7 @@ require ( github.com/containerd/containerd v1.7.7 github.com/containerd/continuity v0.4.2 github.com/containerd/fifo v1.1.0 + github.com/containerd/log v0.1.0 github.com/containerd/typeurl/v2 v2.1.1 github.com/coreos/go-systemd/v22 v22.5.0 github.com/cpuguy83/tar2go v0.3.1 @@ -135,7 +136,6 @@ require ( github.com/containerd/console v1.0.3 // indirect github.com/containerd/go-cni v1.1.9 // indirect github.com/containerd/go-runc v1.1.0 // indirect - github.com/containerd/log v0.1.0 // indirect github.com/containerd/nydus-snapshotter v0.8.2 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect diff --git a/volume/drivers/adapter.go b/volume/drivers/adapter.go index b6c6ad694c..8027ddb98b 100644 --- a/volume/drivers/adapter.go +++ b/volume/drivers/adapter.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/volume" ) diff --git a/volume/drivers/extpoint.go b/volume/drivers/extpoint.go index 7b604b4e13..16595f4af9 100644 --- a/volume/drivers/extpoint.go +++ b/volume/drivers/extpoint.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" getter "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" diff --git a/volume/local/local.go b/volume/local/local.go index d4e58c7976..1b9f580ff2 100644 --- a/volume/local/local.go +++ b/volume/local/local.go @@ -12,7 +12,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/daemon/names" "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/idtools" diff --git a/volume/mounts/mounts.go b/volume/mounts/mounts.go index 2144d97f3a..343012a381 100644 --- a/volume/mounts/mounts.go +++ b/volume/mounts/mounts.go @@ -7,7 +7,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/stringid" diff --git a/volume/service/convert.go b/volume/service/convert.go index f988811ace..6d92a36b04 100644 --- a/volume/service/convert.go +++ b/volume/service/convert.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/filters" volumetypes "github.com/docker/docker/api/types/volume" "github.com/docker/docker/errdefs" diff --git a/volume/service/db.go b/volume/service/db.go index 070d5c34ba..18fcb80e6c 100644 --- a/volume/service/db.go +++ b/volume/service/db.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" diff --git a/volume/service/restore.go b/volume/service/restore.go index f345a65c7e..a4ce4b3a59 100644 --- a/volume/service/restore.go +++ b/volume/service/restore.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/volume" bolt "go.etcd.io/bbolt" ) diff --git a/volume/service/service.go b/volume/service/service.go index 4fe0db9c88..e9df6ad593 100644 --- a/volume/service/service.go +++ b/volume/service/service.go @@ -5,7 +5,7 @@ import ( "strconv" "sync/atomic" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/volume/service/store.go b/volume/service/store.go index 92159ccd07..8f94f096ca 100644 --- a/volume/service/store.go +++ b/volume/service/store.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/docker/docker/api/types/events" "github.com/docker/docker/errdefs" "github.com/docker/docker/volume"