Merge pull request moby#48102 from thaJeztah/runconfig_remove_deprecated

runconfig, runconfig/opts: remove deprecated types and functions

runconfig/config.go

@@ -10,12 +10,6 @@ import (
 	"github.com/docker/docker/pkg/sysinfo"
 )
 
-// ContainerConfigWrapper is a Config wrapper that holds the container Config (portable)
-// and the corresponding HostConfig (non-portable).
-//
-// Deprecated: use [container.CreateRequest].
-type ContainerConfigWrapper = container.CreateRequest
-
 // ContainerDecoder implements httputils.ContainerDecoder
 // calling DecodeContainerConfig.
 type ContainerDecoder struct {

runconfig/hostconfig.go

@@ -4,21 +4,8 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
 )
 
-// SetDefaultNetModeIfBlank changes the NetworkMode in a HostConfig structure
-// to default if it is not populated. This ensures backwards compatibility after
-// the validation of the network mode was moved from the docker CLI to the
-// docker daemon.
-//
-// Deprecated: SetDefaultNetModeIfBlank is no longer used abnd will be removed in the next release.
-func SetDefaultNetModeIfBlank(hc *container.HostConfig) {
-	if hc != nil && hc.NetworkMode == "" {
-		hc.NetworkMode = network.NetworkDefault
-	}
-}
-
 // validateNetContainerMode ensures that the various combinations of requested
 // network settings wrt container mode are valid.
 func validateNetContainerMode(c *container.Config, hc *container.HostConfig) error {

runconfig/hostconfig_unix.go

@@ -7,26 +7,9 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/pkg/sysinfo"
 )
 
-// DefaultDaemonNetworkMode returns the default network stack the daemon should
-// use.
-//
-// Deprecated: this function is no longer in use and will be removed in the next release.
-func DefaultDaemonNetworkMode() container.NetworkMode {
-	return network.NetworkBridge
-}
-
-// IsPreDefinedNetwork indicates if a network is predefined by the daemon
-//
-// Deprecated: this function is no longer used and will be removed in the next release.
-func IsPreDefinedNetwork(network string) bool {
-	n := container.NetworkMode(network)
-	return n.IsBridge() || n.IsHost() || n.IsNone() || n.IsDefault()
-}
-
 // validateNetMode ensures that the various combinations of requested
 // network settings are valid.
 func validateNetMode(c *container.Config, hc *container.HostConfig) error {

runconfig/hostconfig_windows.go

@@ -4,25 +4,9 @@ import (
 	"fmt"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/pkg/sysinfo"
 )
 
-// DefaultDaemonNetworkMode returns the default network stack the daemon should
-// use.
-//
-// Deprecated: this function is no longer in use and will be removed in the next release.
-func DefaultDaemonNetworkMode() container.NetworkMode {
-	return network.NetworkNat
-}
-
-// IsPreDefinedNetwork indicates if a network is predefined by the daemon.
-//
-// Deprecated: this function is no longer used and will be removed in the next release.
-func IsPreDefinedNetwork(network string) bool {
-	return !container.NetworkMode(network).IsUserDefined()
-}
-
 // validateNetMode ensures that the various combinations of requested
 // network settings are valid.
 func validateNetMode(c *container.Config, hc *container.HostConfig) error {