diff --git a/archive/compression/compression.go b/archive/compression/compression.go index ceceb21f5655..31bbe4124665 100644 --- a/archive/compression/compression.go +++ b/archive/compression/compression.go @@ -25,12 +25,12 @@ import ( "fmt" "io" "os" + "os/exec" "strconv" "sync" "github.com/containerd/containerd/log" "github.com/klauspost/compress/zstd" - exec "golang.org/x/sys/execabs" ) type ( diff --git a/archive/compression/compression_test.go b/archive/compression/compression_test.go index fe1a62e35cd4..f9a535dde3cd 100644 --- a/archive/compression/compression_test.go +++ b/archive/compression/compression_test.go @@ -23,12 +23,11 @@ import ( "crypto/rand" "io" "os" + "os/exec" "path/filepath" "runtime" "strings" "testing" - - exec "golang.org/x/sys/execabs" ) func TestMain(m *testing.M) { diff --git a/archive/tar_test.go b/archive/tar_test.go index 1ced02531c99..dc643a306748 100644 --- a/archive/tar_test.go +++ b/archive/tar_test.go @@ -27,6 +27,7 @@ import ( "fmt" "io" "os" + "os/exec" "path/filepath" "runtime" "testing" @@ -38,7 +39,6 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" ) const tarCmd = "tar" diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go index 94a9f0ca4c1b..ca24ce039dad 100644 --- a/cmd/containerd-shim/main_unix.go +++ b/cmd/containerd-shim/main_unix.go @@ -27,6 +27,7 @@ import ( "io" "net" "os" + "os/exec" "os/signal" "runtime" "runtime/debug" @@ -48,7 +49,6 @@ import ( "github.com/containerd/containerd/version" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index e5a830586f6b..08193a14a7a2 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -20,6 +20,7 @@ import ( "fmt" "log" "os" + "os/exec" "path/filepath" "time" @@ -27,7 +28,6 @@ import ( "github.com/containerd/containerd/services/server" "github.com/sirupsen/logrus" "github.com/urfave/cli" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index 47fec994462b..d4cfa92fb1e9 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -21,6 +21,7 @@ import ( "fmt" "io" "os" + "os/exec" "sort" "strings" "text/tabwriter" @@ -35,7 +36,6 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli" - exec "golang.org/x/sys/execabs" ) var ( diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go index 75df0d99e492..5869cffaa1f8 100644 --- a/contrib/apparmor/template.go +++ b/contrib/apparmor/template.go @@ -25,11 +25,10 @@ import ( "fmt" "io" "os" + "os/exec" "path" "strings" "text/template" - - exec "golang.org/x/sys/execabs" ) // NOTE: This code is copied from . diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index a808dd166c94..d08044aa203d 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -20,13 +20,13 @@ import ( "context" "fmt" "os" + "os/exec" "strconv" "strings" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" - exec "golang.org/x/sys/execabs" ) // NvidiaCLI is the path to the Nvidia helper binary diff --git a/diff/stream_unix.go b/diff/stream_unix.go index 82fc31b402d3..893456b9d464 100644 --- a/diff/stream_unix.go +++ b/diff/stream_unix.go @@ -25,12 +25,12 @@ import ( "fmt" "io" "os" + "os/exec" "sync" "github.com/containerd/containerd/protobuf" "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/typeurl/v2" - exec "golang.org/x/sys/execabs" ) // NewBinaryProcessor returns a binary processor for use with processing content streams diff --git a/diff/stream_windows.go b/diff/stream_windows.go index e6026f4e98ad..b5ce52664414 100644 --- a/diff/stream_windows.go +++ b/diff/stream_windows.go @@ -23,6 +23,7 @@ import ( "fmt" "io" "os" + "os/exec" "path/filepath" "sync" @@ -31,7 +32,6 @@ import ( "github.com/containerd/containerd/protobuf/proto" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" - exec "golang.org/x/sys/execabs" ) const processorPipe = "STREAM_PROCESSOR_PIPE" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 9b6f7068c68b..3892d96163d3 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -23,6 +23,7 @@ import ( "fmt" "io" "os" + "os/exec" "testing" "time" @@ -30,7 +31,6 @@ import ( "github.com/opencontainers/image-spec/identity" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - exec "golang.org/x/sys/execabs" . "github.com/containerd/containerd" "github.com/containerd/containerd/defaults" diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go index 7d2762113ed9..ffed9b3727d5 100644 --- a/integration/client/container_fuzzer.go +++ b/integration/client/container_fuzzer.go @@ -26,13 +26,13 @@ import ( "io" "net/http" "os" + "os/exec" "strings" "time" fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd" "github.com/containerd/containerd/oci" - exec "golang.org/x/sys/execabs" ) var ( diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 23aa6754e6cf..5be05b0542d0 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -22,6 +22,7 @@ import ( "fmt" "io" "os" + "os/exec" "path/filepath" "runtime" "strings" @@ -45,7 +46,6 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/integration/client/container_test.go b/integration/client/container_test.go index d8b0216074ca..243b4e5e2cbb 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -22,6 +22,7 @@ import ( "fmt" "io" "os" + "os/exec" "path" "path/filepath" "runtime" @@ -49,7 +50,6 @@ import ( "github.com/containerd/typeurl/v2" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" ) func empty() cio.Creator { diff --git a/integration/client/daemon.go b/integration/client/daemon.go index 7698577920aa..3822004d8fd8 100644 --- a/integration/client/daemon.go +++ b/integration/client/daemon.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" "io" + "os/exec" "runtime" "sync" "syscall" "time" . "github.com/containerd/containerd" - exec "golang.org/x/sys/execabs" ) type daemon struct { diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index e7d0025e6d59..44e1cec50b6e 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -22,6 +22,7 @@ import ( "errors" "fmt" "os" + "os/exec" "path/filepath" "runtime" "strconv" @@ -37,7 +38,6 @@ import ( "github.com/containerd/containerd/runtime/restart" srvconfig "github.com/containerd/containerd/services/server/config" "github.com/containerd/typeurl/v2" - exec "golang.org/x/sys/execabs" ) //nolint:unused // Ignore on non-Linux diff --git a/integration/image_load_test.go b/integration/image_load_test.go index 9a3f05c6033d..aa63f06faf7e 100644 --- a/integration/image_load_test.go +++ b/integration/image_load_test.go @@ -17,13 +17,13 @@ package integration import ( + "os/exec" "path/filepath" "testing" "time" "github.com/containerd/containerd/integration/images" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index c1aba62209a9..f9d245b482c2 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -22,6 +22,7 @@ import ( "io" "net" "os" + "os/exec" "strconv" "strings" "syscall" @@ -36,7 +37,6 @@ import ( "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" ) // TestIssue7496 is used to reproduce https://github.com/containerd/containerd/issues/7496 diff --git a/integration/main_test.go b/integration/main_test.go index 5e86ec934fe9..29985d05a8f1 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -25,6 +25,7 @@ import ( "fmt" "io" "os" + "os/exec" "path/filepath" goruntime "runtime" "strconv" @@ -47,7 +48,6 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/pod_userns_linux_test.go b/integration/pod_userns_linux_test.go index b020d64aece7..f0255037439f 100644 --- a/integration/pod_userns_linux_test.go +++ b/integration/pod_userns_linux_test.go @@ -19,6 +19,7 @@ package integration import ( "fmt" "os" + "os/exec" "path/filepath" "syscall" "testing" @@ -27,7 +28,6 @@ import ( "github.com/containerd/containerd/integration/images" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/integration/volume_copy_up_unix_test.go b/integration/volume_copy_up_unix_test.go index cf2d69a66330..d0c599ba58bd 100644 --- a/integration/volume_copy_up_unix_test.go +++ b/integration/volume_copy_up_unix_test.go @@ -20,8 +20,7 @@ package integration import ( "fmt" - - exec "golang.org/x/sys/execabs" + "os/exec" ) func getOwnership(path string) (string, error) { diff --git a/mount/lookup_linux_test.go b/mount/lookup_linux_test.go index dc10d8da687d..a805dffe74ad 100644 --- a/mount/lookup_linux_test.go +++ b/mount/lookup_linux_test.go @@ -19,6 +19,7 @@ package mount import ( "fmt" "os" + "os/exec" "path/filepath" "strings" "testing" @@ -28,7 +29,6 @@ import ( "github.com/containerd/continuity/testutil" "github.com/containerd/continuity/testutil/loopback" "github.com/stretchr/testify/assert" - exec "golang.org/x/sys/execabs" ) func checkLookup(t *testing.T, fsType, mntPoint, dir string) { diff --git a/mount/mount_freebsd.go b/mount/mount_freebsd.go index f41df3dea4e2..3a5c09353cd1 100644 --- a/mount/mount_freebsd.go +++ b/mount/mount_freebsd.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" "os" + "os/exec" "time" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/mount/mount_linux.go b/mount/mount_linux.go index b58e249d9fb8..8ddbf9c996d3 100644 --- a/mount/mount_linux.go +++ b/mount/mount_linux.go @@ -20,12 +20,12 @@ import ( "errors" "fmt" "os" + "os/exec" "path" "runtime" "strings" "time" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/mount/mount_linux_test.go b/mount/mount_linux_test.go index 2a3bac9908b3..5ab21828cb11 100644 --- a/mount/mount_linux_test.go +++ b/mount/mount_linux_test.go @@ -19,12 +19,12 @@ package mount import ( "fmt" "os" + "os/exec" "path/filepath" "reflect" "testing" "github.com/containerd/continuity/testutil" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/pkg/process/io.go b/pkg/process/io.go index 687d5a2a36c9..7d489fdc110e 100644 --- a/pkg/process/io.go +++ b/pkg/process/io.go @@ -24,6 +24,7 @@ import ( "io" "net/url" "os" + "os/exec" "path/filepath" "sync" "sync/atomic" @@ -36,7 +37,6 @@ import ( "github.com/containerd/fifo" runc "github.com/containerd/go-runc" "github.com/hashicorp/go-multierror" - exec "golang.org/x/sys/execabs" ) const binaryIOProcTermTimeout = 12 * time.Second // Give logger process solid 10 seconds for cleanup diff --git a/pkg/process/io_util.go b/pkg/process/io_util.go index e814c114b9d0..72bbf9233f8f 100644 --- a/pkg/process/io_util.go +++ b/pkg/process/io_util.go @@ -19,8 +19,7 @@ package process import ( "net/url" "os" - - exec "golang.org/x/sys/execabs" + "os/exec" ) // NewBinaryCmd returns a Cmd to be used to start a logging binary. diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go index 8b626833720f..c1668182bfb8 100644 --- a/runtime/v1/shim/client/client.go +++ b/runtime/v1/shim/client/client.go @@ -25,6 +25,7 @@ import ( "io" "net" "os" + "os/exec" "path/filepath" "strconv" "strings" @@ -40,7 +41,6 @@ import ( shimapi "github.com/containerd/containerd/runtime/v1/shim/v1" "github.com/containerd/containerd/sys" "github.com/containerd/ttrpc" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/runtime/v1/shim/client/client_linux.go b/runtime/v1/shim/client/client_linux.go index 21353ce241dc..538c9ded1fae 100644 --- a/runtime/v1/shim/client/client_linux.go +++ b/runtime/v1/shim/client/client_linux.go @@ -18,10 +18,10 @@ package client import ( "fmt" + "os/exec" "syscall" "github.com/containerd/cgroups/v3/cgroup1" - exec "golang.org/x/sys/execabs" ) func getSysProcAttr() *syscall.SysProcAttr { diff --git a/runtime/v1/shim/client/client_unix.go b/runtime/v1/shim/client/client_unix.go index 2533f7138e4e..40b6d079452a 100644 --- a/runtime/v1/shim/client/client_unix.go +++ b/runtime/v1/shim/client/client_unix.go @@ -19,9 +19,8 @@ package client import ( + "os/exec" "syscall" - - exec "golang.org/x/sys/execabs" ) func getSysProcAttr() *syscall.SysProcAttr { diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go index 8d20d89e1574..754bb6b285d9 100644 --- a/runtime/v2/runc/manager/manager_linux.go +++ b/runtime/v2/runc/manager/manager_linux.go @@ -21,6 +21,7 @@ import ( "encoding/json" "fmt" "os" + "os/exec" "path/filepath" goruntime "runtime" "syscall" @@ -39,7 +40,6 @@ import ( "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/shim" runcC "github.com/containerd/go-runc" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index 79905aaac54d..26c68fe262c2 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -23,6 +23,7 @@ import ( "fmt" "io" "os" + "os/exec" "path/filepath" goruntime "runtime" "sync" @@ -51,7 +52,6 @@ import ( runcC "github.com/containerd/go-runc" "github.com/containerd/typeurl/v2" "github.com/sirupsen/logrus" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index fce1318a63ad..56287692ae91 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -24,13 +24,13 @@ import ( "io" "net" "os" + "os/exec" "path/filepath" "strings" "time" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" - exec "golang.org/x/sys/execabs" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go index 02eb93d3782f..d5cb8236bfd1 100644 --- a/snapshots/btrfs/btrfs_test.go +++ b/snapshots/btrfs/btrfs_test.go @@ -24,6 +24,7 @@ import ( "errors" "fmt" "os" + "os/exec" "path/filepath" "strings" "testing" @@ -35,7 +36,6 @@ import ( "github.com/containerd/containerd/snapshots" "github.com/containerd/containerd/snapshots/testsuite" "github.com/containerd/continuity/testutil/loopback" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) @@ -51,7 +51,6 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap } return func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { - loopbackSize := int64(128 << 20) // 128 MB // mkfs.btrfs creates a fs which has a blocksize equal to the system default pagesize. If that pagesize // is > 4KB, mounting the fs will fail unless we increase the size of the file used by mkfs.btrfs @@ -59,7 +58,6 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap loopbackSize = int64(650 << 20) // 650 MB } loop, err := loopback.New(loopbackSize) - if err != nil { return nil, nil, err } @@ -146,7 +144,7 @@ func TestBtrfsMounts(t *testing.T) { } } - if err := os.MkdirAll(target, 0755); err != nil { + if err := os.MkdirAll(target, 0o755); err != nil { t.Fatal(err) } if err := mount.All(mounts, target); err != nil { @@ -155,13 +153,13 @@ func TestBtrfsMounts(t *testing.T) { defer testutil.Unmount(t, target) // write in some data - if err := os.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0777); err != nil { + if err := os.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0o777); err != nil { t.Fatal(err) } // TODO(stevvooe): We don't really make this with the driver, but that // might prove annoying in practice. - if err := os.MkdirAll(filepath.Join(root, "snapshots"), 0755); err != nil { + if err := os.MkdirAll(filepath.Join(root, "snapshots"), 0o755); err != nil { t.Fatal(err) } @@ -175,7 +173,7 @@ func TestBtrfsMounts(t *testing.T) { t.Fatal(err) } - if err := os.MkdirAll(target, 0755); err != nil { + if err := os.MkdirAll(target, 0o755); err != nil { t.Fatal(err) } @@ -192,7 +190,7 @@ func TestBtrfsMounts(t *testing.T) { t.Fatalf("wrong content in foo want: content, got: %s", bs) } - if err := os.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0777); err != nil { + if err := os.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0o777); err != nil { t.Fatal(err) } diff --git a/snapshots/devmapper/blkdiscard/blkdiscard.go b/snapshots/devmapper/blkdiscard/blkdiscard.go index bec283047426..1718bbff5ac4 100644 --- a/snapshots/devmapper/blkdiscard/blkdiscard.go +++ b/snapshots/devmapper/blkdiscard/blkdiscard.go @@ -18,7 +18,7 @@ package blkdiscard -import exec "golang.org/x/sys/execabs" +import "os/exec" // Version returns the output of "blkdiscard --version" func Version() (string, error) { diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/snapshots/devmapper/dmsetup/dmsetup.go index 8d1c145c03b8..3ef1cf008d9e 100644 --- a/snapshots/devmapper/dmsetup/dmsetup.go +++ b/snapshots/devmapper/dmsetup/dmsetup.go @@ -25,11 +25,11 @@ import ( "fmt" "io" "os" + "os/exec" "strconv" "strings" blkdiscard "github.com/containerd/containerd/snapshots/devmapper/blkdiscard" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" ) diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go index 02c5fec7c32a..742b1501ed86 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/snapshots/devmapper/pool_device_test.go @@ -22,6 +22,7 @@ import ( "context" "fmt" "os" + "os/exec" "path/filepath" "testing" "time" @@ -32,7 +33,6 @@ import ( "github.com/docker/go-units" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - exec "golang.org/x/sys/execabs" ) const ( diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index a801cbc26fd8..b9db17a71c3f 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -23,6 +23,7 @@ import ( "errors" "fmt" "os" + "os/exec" "path/filepath" "strings" "sync" @@ -34,7 +35,6 @@ import ( "github.com/containerd/containerd/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/snapshots/storage" "github.com/hashicorp/go-multierror" - exec "golang.org/x/sys/execabs" ) type fsType string diff --git a/snapshots/overlay/overlayutils/check_test.go b/snapshots/overlay/overlayutils/check_test.go index 7dba370f8e80..678b78356955 100644 --- a/snapshots/overlay/overlayutils/check_test.go +++ b/snapshots/overlay/overlayutils/check_test.go @@ -19,11 +19,11 @@ package overlayutils import ( + "os/exec" "testing" "github.com/containerd/containerd/pkg/testutil" "github.com/containerd/continuity/testutil/loopback" - exec "golang.org/x/sys/execabs" ) func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) { diff --git a/sys/oom_linux_test.go b/sys/oom_linux_test.go index 52e7c18fadaa..a1b03de610fc 100644 --- a/sys/oom_linux_test.go +++ b/sys/oom_linux_test.go @@ -20,13 +20,13 @@ import ( "errors" "fmt" "os" + "os/exec" "testing" "time" "github.com/containerd/containerd/pkg/userns" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - exec "golang.org/x/sys/execabs" ) func TestSetPositiveOomScoreAdjustment(t *testing.T) { diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go index 8172f224e8b3..bfc9a95fb28f 100644 --- a/sys/reaper/reaper_unix.go +++ b/sys/reaper/reaper_unix.go @@ -21,12 +21,12 @@ package reaper import ( "errors" "fmt" + "os/exec" "sync" "syscall" "time" runc "github.com/containerd/go-runc" - exec "golang.org/x/sys/execabs" "golang.org/x/sys/unix" )