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

Make buildSandboxOption a function instead of a Daemon method

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2024-10-15 09:48:13 +01:00
parent 4c553defce
commit 788db583b1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/container_operations.go
View File

@@ -43,7 +43,7 @@ func ipAddresses(ips []net.IP) []string {
return addrs
}
func (daemon *Daemon) buildSandboxOptions(cfg *config.Config, ctr *container.Container) ([]libnetwork.SandboxOption, error) {
func buildSandboxOptions(cfg *config.Config, ctr *container.Container) ([]libnetwork.SandboxOption, error) {
var sboxOptions []libnetwork.SandboxOption
sboxOptions = append(sboxOptions, libnetwork.OptionHostname(ctr.Config.Hostname), libnetwork.OptionDomainname(ctr.Config.Domainname))
@@ -248,7 +248,7 @@ func (daemon *Daemon) updateNetwork(cfg *config.Config, ctr *container.Container
return nil
}
sbOptions, err := daemon.buildSandboxOptions(cfg, ctr)
sbOptions, err := buildSandboxOptions(cfg, ctr)
if err != nil {
return fmt.Errorf("Update network failed: %v", err)
}
@@ -438,7 +438,7 @@ func (daemon *Daemon) allocateNetwork(ctx context.Context, cfg *config.Config, c
daemon.updateContainerNetworkSettings(ctr, nil)
sbOptions, err := daemon.buildSandboxOptions(cfg, ctr)
sbOptions, err := buildSandboxOptions(cfg, ctr)
if err != nil {
return err
}

2
daemon/daemon.go
View File

@@ -473,7 +473,7 @@ func (daemon *Daemon) restore(cfg *configStore) error {
c.ResetRestartManager(false)
if !c.HostConfig.NetworkMode.IsContainer() && c.IsRunning() {
options, err := daemon.buildSandboxOptions(&cfg.Config, c)
options, err := buildSandboxOptions(&cfg.Config, c)
if err != nil {
logger(c).WithError(err).Warn("failed to build sandbox option to restore container")
}