diff --git a/pkg/shim/BUILD b/pkg/shim/BUILD index 5587b61a8..f09dbbad9 100644 --- a/pkg/shim/BUILD +++ b/pkg/shim/BUILD @@ -14,12 +14,12 @@ go_library( "//pkg/shim/extension", "//pkg/shim/runsc", "//pkg/sync", - "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//namespaces:go_default_library", "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", "@com_github_containerd_containerd//runtime/v2/task:go_default_library", "@com_github_containerd_containerd//sys:go_default_library", "@com_github_containerd_errdefs//:go_default_library", + "@com_github_containerd_log//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", "@org_golang_x_sys//unix:go_default_library", ], diff --git a/pkg/shim/proc/BUILD b/pkg/shim/proc/BUILD index d1b11dd2f..c367657bc 100644 --- a/pkg/shim/proc/BUILD +++ b/pkg/shim/proc/BUILD @@ -29,12 +29,12 @@ go_library( "//pkg/shim/runsccmd", "//pkg/shim/utils", "@com_github_containerd_console//:go_default_library", - "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//mount:go_default_library", "@com_github_containerd_containerd//pkg/stdio:go_default_library", "@com_github_containerd_errdefs//:go_default_library", "@com_github_containerd_fifo//:go_default_library", "@com_github_containerd_go_runc//:go_default_library", + "@com_github_containerd_log//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", "@com_github_opencontainers_runtime_spec//specs-go:go_default_library", "@org_golang_x_sys//unix:go_default_library", diff --git a/pkg/shim/proc/exec.go b/pkg/shim/proc/exec.go index 65698b6ce..6e7624415 100644 --- a/pkg/shim/proc/exec.go +++ b/pkg/shim/proc/exec.go @@ -25,11 +25,11 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/errdefs" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup" diff --git a/pkg/shim/proc/init.go b/pkg/shim/proc/init.go index 1815b7876..d6c83a41a 100644 --- a/pkg/shim/proc/init.go +++ b/pkg/shim/proc/init.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/console" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/stdio" "github.com/containerd/errdefs" + "github.com/containerd/log" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" diff --git a/pkg/shim/proc/io.go b/pkg/shim/proc/io.go index 6aa588310..c979aa247 100644 --- a/pkg/shim/proc/io.go +++ b/pkg/shim/proc/io.go @@ -22,9 +22,9 @@ import ( "os" "sync" - "github.com/containerd/containerd/log" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" + "github.com/containerd/log" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/atomicbitops" ) diff --git a/pkg/shim/runsc/BUILD b/pkg/shim/runsc/BUILD index 19c43cd84..0207fc6f3 100644 --- a/pkg/shim/runsc/BUILD +++ b/pkg/shim/runsc/BUILD @@ -35,7 +35,6 @@ go_library( "@com_github_containerd_containerd//api/events:go_default_library", "@com_github_containerd_containerd//api/types/task:go_default_library", "@com_github_containerd_containerd//events:go_default_library", - "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//mount:go_default_library", "@com_github_containerd_containerd//namespaces:go_default_library", "@com_github_containerd_containerd//pkg/process:go_default_library", @@ -47,6 +46,7 @@ go_library( "@com_github_containerd_containerd//sys/reaper:go_default_library", "@com_github_containerd_errdefs//:go_default_library", "@com_github_containerd_fifo//:go_default_library", + "@com_github_containerd_log//:go_default_library", "@com_github_containerd_typeurl//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", "@com_github_opencontainers_runtime_spec//specs-go:go_default_library", diff --git a/pkg/shim/runsc/debug.go b/pkg/shim/runsc/debug.go index d7fe12a09..3e17e9069 100644 --- a/pkg/shim/runsc/debug.go +++ b/pkg/shim/runsc/debug.go @@ -21,7 +21,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/log" + "github.com/containerd/log" ) var once sync.Once diff --git a/pkg/shim/runsc/service.go b/pkg/shim/runsc/service.go index 64aecf8e7..a9c1b2653 100644 --- a/pkg/shim/runsc/service.go +++ b/pkg/shim/runsc/service.go @@ -32,7 +32,6 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/process" @@ -43,6 +42,7 @@ import ( taskAPI "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys/reaper" "github.com/containerd/errdefs" + "github.com/containerd/log" "github.com/containerd/typeurl" "github.com/gogo/protobuf/types" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/shim/runsccmd/BUILD b/pkg/shim/runsccmd/BUILD index 59f9bfa9d..9942fd1db 100644 --- a/pkg/shim/runsccmd/BUILD +++ b/pkg/shim/runsccmd/BUILD @@ -13,8 +13,8 @@ go_library( ], visibility = ["//pkg/shim:__subpackages__"], deps = [ - "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_go_runc//:go_default_library", + "@com_github_containerd_log//:go_default_library", "@com_github_opencontainers_runtime_spec//specs-go:go_default_library", "@org_golang_x_sys//unix:go_default_library", ], diff --git a/pkg/shim/runsccmd/runsc.go b/pkg/shim/runsccmd/runsc.go index e195a63af..3b8a30f4d 100644 --- a/pkg/shim/runsccmd/runsc.go +++ b/pkg/shim/runsccmd/runsc.go @@ -28,8 +28,8 @@ import ( "strconv" "time" - "github.com/containerd/containerd/log" runc "github.com/containerd/go-runc" + "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" ) diff --git a/pkg/shim/service.go b/pkg/shim/service.go index 924d3bbcb..74113b738 100644 --- a/pkg/shim/service.go +++ b/pkg/shim/service.go @@ -21,12 +21,12 @@ import ( "os" "os/exec" - "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime/v2/shim" taskapi "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys" "github.com/containerd/errdefs" + "github.com/containerd/log" "github.com/gogo/protobuf/types" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup"