diff --git a/daemon/container/state.go b/daemon/container/state.go index f87d24a295..5780db8581 100644 --- a/daemon/container/state.go +++ b/daemon/container/state.go @@ -58,14 +58,6 @@ type State struct { task libcontainerdtypes.Task } -// StateStatus is used to return container wait results. -// Implements exec.ExitCode interface. -// This type is needed as State include a sync.Mutex field which make -// copying it unsafe. -// -// Deprecated: use [container.StateStatus] instead. -type StateStatus = container.StateStatus - // NewState creates a default state object. func NewState() *State { return &State{} @@ -153,20 +145,6 @@ func IsValidStateString(s container.ContainerState) bool { return container.ValidateContainerState(s) == nil } -// WaitCondition is an enum type for different states to wait for. -// -// Deprecated: use [container.WaitCondition] instead. -type WaitCondition = container.WaitCondition - -const ( - // Deprecated: use [container.WaitConditionNotRunning] instead. - WaitConditionNotRunning = container.WaitConditionNotRunning - // Deprecated: use [container.WaitConditionNextExit] instead. - WaitConditionNextExit = container.WaitConditionNextExit - // Deprecated: use [container.WaitConditionRemoved] instead. - WaitConditionRemoved = container.WaitConditionRemoved -) - // Wait waits until the container is in a certain state indicated by the given // condition. A context must be used for cancelling the request, controlling // timeouts, and avoiding goroutine leaks. Wait must be called without holding