diff options
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/ioutils/tempdir_deprecated.go | 10 | ||||
-rw-r--r-- | pkg/platform/platform.go | 8 | ||||
-rw-r--r-- | pkg/process/process_windows.go | 7 | ||||
-rw-r--r-- | pkg/system/meminfo_deprecated.go | 16 | ||||
-rw-r--r-- | pkg/system/path_deprecated.go | 18 | ||||
-rw-r--r-- | pkg/system/process_deprecated.go | 27 |
6 files changed, 0 insertions, 86 deletions
diff --git a/pkg/ioutils/tempdir_deprecated.go b/pkg/ioutils/tempdir_deprecated.go deleted file mode 100644 index b3321602c2..0000000000 --- a/pkg/ioutils/tempdir_deprecated.go +++ /dev/null @@ -1,10 +0,0 @@ -package ioutils - -import "github.com/docker/docker/pkg/longpath" - -// TempDir is the equivalent of [os.MkdirTemp], except that on Windows -// the result is in Windows longpath format. On Unix systems it is -// equivalent to [os.MkdirTemp]. -// -// Deprecated: use [longpath.MkdirTemp]. -var TempDir = longpath.MkdirTemp diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go index 8d90433b60..380cfd160e 100644 --- a/pkg/platform/platform.go +++ b/pkg/platform/platform.go @@ -3,8 +3,6 @@ package platform // import "github.com/docker/docker/pkg/platform" import ( - "runtime" - "github.com/sirupsen/logrus" ) @@ -17,12 +15,6 @@ import ( // when running a "linux/386" compiled binary on "linux/amd64" hardware. var Architecture string -// OSType holds the runtime operating system type of the process. It is -// an alias for [runtime.GOOS]. -// -// Deprecated: use [runtime.GOOS] instead. -const OSType = runtime.GOOS - func init() { var err error Architecture, err = runtimeArchitecture() diff --git a/pkg/process/process_windows.go b/pkg/process/process_windows.go index 26158d09ec..2dd57e8254 100644 --- a/pkg/process/process_windows.go +++ b/pkg/process/process_windows.go @@ -43,10 +43,3 @@ func Kill(pid int) error { } return nil } - -// Zombie is not supported on Windows. -// -// TODO(thaJeztah): remove once we remove the stubs from pkg/system. -func Zombie(_ int) (bool, error) { - return false, nil -} diff --git a/pkg/system/meminfo_deprecated.go b/pkg/system/meminfo_deprecated.go deleted file mode 100644 index 216519923e..0000000000 --- a/pkg/system/meminfo_deprecated.go +++ /dev/null @@ -1,16 +0,0 @@ -package system - -import "github.com/docker/docker/pkg/meminfo" - -// MemInfo contains memory statistics of the host system. -// -// Deprecated: use [meminfo.Memory]. -type MemInfo = meminfo.Memory - -// ReadMemInfo retrieves memory statistics of the host system and returns a -// MemInfo type. -// -// Deprecated: use [meminfo.Read]. -func ReadMemInfo() (*meminfo.Memory, error) { - return meminfo.Read() -} diff --git a/pkg/system/path_deprecated.go b/pkg/system/path_deprecated.go deleted file mode 100644 index 5c95026c3d..0000000000 --- a/pkg/system/path_deprecated.go +++ /dev/null @@ -1,18 +0,0 @@ -package system - -const defaultUnixPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - -// DefaultPathEnv is unix style list of directories to search for -// executables. Each directory is separated from the next by a colon -// ':' character . -// For Windows containers, an empty string is returned as the default -// path will be set by the container, and Docker has no context of what the -// default path should be. -// -// Deprecated: use oci.DefaultPathEnv -func DefaultPathEnv(os string) string { - if os == "windows" { - return "" - } - return defaultUnixPathEnv -} diff --git a/pkg/system/process_deprecated.go b/pkg/system/process_deprecated.go deleted file mode 100644 index 7b9f19acd5..0000000000 --- a/pkg/system/process_deprecated.go +++ /dev/null @@ -1,27 +0,0 @@ -//go:build linux || freebsd || darwin || windows -// +build linux freebsd darwin windows - -package system - -import "github.com/docker/docker/pkg/process" - -var ( - // IsProcessAlive returns true if process with a given pid is running. - // - // Deprecated: use [process.Alive]. - IsProcessAlive = process.Alive - - // IsProcessZombie return true if process has a state with "Z" - // - // Deprecated: use [process.Zombie]. - // - // TODO(thaJeztah): remove the Windows implementation in process once we remove this stub. - IsProcessZombie = process.Zombie -) - -// KillProcess force-stops a process. -// -// Deprecated: use [process.Kill]. -func KillProcess(pid int) { - _ = process.Kill(pid) -} |