Forráskód Böngészése

daemon: change Daemon.setupPathsAndSandboxOptions to a regular func

It's not using the daemon in any way, so let's change it to a regular
function.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 éve
szülő
commit
603547fa19

+ 1 - 1
daemon/container_operations.go

@@ -63,7 +63,7 @@ func (daemon *Daemon) buildSandboxOptions(cfg *config.Config, container *contain
 		sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
 		sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
 	}
 	}
 
 
-	if err = daemon.setupPathsAndSandboxOptions(container, cfg, &sboxOptions); err != nil {
+	if err = setupPathsAndSandboxOptions(container, cfg, &sboxOptions); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 
 

+ 1 - 1
daemon/container_operations_unix.go

@@ -382,7 +382,7 @@ func serviceDiscoveryOnDefaultNetwork() bool {
 	return false
 	return false
 }
 }
 
 
-func (daemon *Daemon) setupPathsAndSandboxOptions(container *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
+func setupPathsAndSandboxOptions(container *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
 	var err error
 	var err error
 
 
 	// Set the correct paths for /etc/hosts and /etc/resolv.conf, based on the
 	// Set the correct paths for /etc/hosts and /etc/resolv.conf, based on the

+ 1 - 1
daemon/container_operations_windows.go

@@ -163,7 +163,7 @@ func serviceDiscoveryOnDefaultNetwork() bool {
 	return true
 	return true
 }
 }
 
 
-func (daemon *Daemon) setupPathsAndSandboxOptions(container *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
+func setupPathsAndSandboxOptions(container *container.Container, cfg *config.Config, sboxOptions *[]libnetwork.SandboxOption) error {
 	return nil
 	return nil
 }
 }