InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48008 from thaJeztah/deprecate_runconfig_DefaultDaemonNetworkMode

Browse Source 
runconfig: deprecate DefaultDaemonNetworkMode, move to daemon/network
This commit is contained in:
Sebastiaan van Stijn
2024-06-18 14:13:07 +02:00
committed by GitHub
parent f160cd0087 8e91b64e07
commit 5a4595466b
14 changed files with 104 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/container_operations_unix.go
View File

@@ -14,12 +14,12 @@ import (
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/links"
"github.com/docker/docker/daemon/network"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/libnetwork"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/process"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/runconfig"
"github.com/moby/sys/mount"
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
@@ -30,7 +30,7 @@ func (daemon *Daemon) setupLinkedContainers(ctr *container.Container) ([]string,
var env []string
children := daemon.children(ctr)
bridgeSettings := ctr.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
bridgeSettings := ctr.NetworkSettings.Networks[network.DefaultNetwork]
if bridgeSettings == nil || bridgeSettings.EndpointSettings == nil {
return nil, nil
}
@@ -40,7 +40,7 @@ func (daemon *Daemon) setupLinkedContainers(ctr *container.Container) ([]string,
return nil, fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
}
childBridgeSettings := child.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
childBridgeSettings := child.NetworkSettings.Networks[network.DefaultNetwork]
if childBridgeSettings == nil || childBridgeSettings.EndpointSettings == nil {
return nil, fmt.Errorf("container %s not attached to default bridge network", child.ID)
}
@@ -402,7 +402,7 @@ func killProcessDirectly(ctr *container.Container) error {
func isLinkable(child *container.Container) bool {
// A container is linkable only if it belongs to the default network
_, ok := child.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
_, ok := child.NetworkSettings.Networks[network.DefaultNetwork]
return ok
}