deleted file mode 100644

@@ -1,15 +0,0 @@

-package main

-

-import (

-	"github.com/docker/docker/daemon/config"

-	"github.com/spf13/pflag"

-)

-

-// installConfigFlags adds flags to the pflag.FlagSet to configure the daemon

-func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) {

-	// First handle install flags which are consistent cross-platform

-	installCommonConfigFlags(conf, flags)

-

-	// Then install flags common to unix platforms

-	installUnixConfigFlags(conf, flags)

-}

deleted file mode 100644

@@ -1,7 +0,0 @@

-package container

-

-// setFromExitStatus is a platform specific helper function to set the state

-// based on the ExitStatus structure.

-func (s *State) setFromExitStatus(exitStatus *ExitStatus) {

-	s.ExitCodeValue = exitStatus.ExitCode

-}

@@ -1,5 +1,3 @@

-// +build linux

-

 package cluster

 import (

deleted file mode 100644

@@ -1,57 +0,0 @@

-package cluster

-

-import (

-	"bufio"

-	"fmt"

-	"net"

-	"os/exec"

-	"strings"

-)

-

-func (c *Cluster) resolveSystemAddr() (net.IP, error) {

-	defRouteCmd := "/usr/sbin/ipadm show-addr -p -o addr " +

-		"`/usr/sbin/route get default | /usr/bin/grep interface | " +

-		"/usr/bin/awk '{print $2}'`"

-	out, err := exec.Command("/usr/bin/bash", "-c", defRouteCmd).Output()

-	if err != nil {

-		return nil, fmt.Errorf("cannot get default route: %v", err)

-	}

-

-	defInterface := strings.SplitN(string(out), "/", 2)

-	defInterfaceIP := net.ParseIP(defInterface[0])

-

-	return defInterfaceIP, nil

-}

-

-func listSystemIPs() []net.IP {

-	var systemAddrs []net.IP

-	cmd := exec.Command("/usr/sbin/ipadm", "show-addr", "-p", "-o", "addr")

-	cmdReader, err := cmd.StdoutPipe()

-	if err != nil {

-		return nil

-	}

-

-	if err := cmd.Start(); err != nil {

-		return nil

-	}

-

-	scanner := bufio.NewScanner(cmdReader)

-	go func() {

-		for scanner.Scan() {

-			text := scanner.Text()

-			nameAddrPair := strings.SplitN(text, "/", 2)

-			// Let go of loopback interfaces and docker interfaces

-			systemAddrs = append(systemAddrs, net.ParseIP(nameAddrPair[0]))

-		}

-	}()

-

-	if err := scanner.Err(); err != nil {

-		fmt.Printf("scan underwent err: %+v\n", err)

-	}

-

-	if err := cmd.Wait(); err != nil {

-		fmt.Printf("run command wait: %+v\n", err)

-	}

-

-	return systemAddrs

-}

deleted file mode 100644

@@ -1,30 +0,0 @@

-package config

-

-// Config defines the configuration of a docker daemon.

-// These are the configuration settings that you pass

-// to the docker daemon when you launch it with say: `docker -d -e lxc`

-type Config struct {

-	CommonConfig

-

-	// These fields are common to all unix platforms.

-	CommonUnixConfig

-}

-

-// BridgeConfig stores all the bridge driver specific

-// configuration.

-type BridgeConfig struct {

-	commonBridgeConfig

-

-	// Fields below here are platform specific.

-	commonUnixBridgeConfig

-}

-

-// IsSwarmCompatible defines if swarm mode can be enabled in this config

-func (conf *Config) IsSwarmCompatible() error {

-	return nil

-}

-

-// ValidatePlatformConfig checks if any platform-specific configuration settings are invalid.

-func (conf *Config) ValidatePlatformConfig() error {

-	return nil

-}

deleted file mode 100644

@@ -1,11 +0,0 @@

-package daemon

-

-import (

-	"github.com/docker/docker/container"

-	"github.com/docker/docker/daemon/exec"

-	specs "github.com/opencontainers/runtime-spec/specs-go"

-)

-

-func (daemon *Daemon) execSetPlatformOpt(_ *container.Container, _ *exec.Config, _ *specs.Process) error {

-	return nil

-}

new file mode 100644

@@ -0,0 +1,73 @@

+package daemon

+

+import (

+	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/api/types/backend"

+	"github.com/docker/docker/api/types/versions/v1p19"

+	"github.com/docker/docker/container"

+	"github.com/docker/docker/daemon/exec"

+)

+

+// This sets platform-specific fields

+func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {

+	contJSONBase.AppArmorProfile = container.AppArmorProfile

+	contJSONBase.ResolvConfPath = container.ResolvConfPath

+	contJSONBase.HostnamePath = container.HostnamePath

+	contJSONBase.HostsPath = container.HostsPath

+

+	return contJSONBase

+}

+

+// containerInspectPre120 gets containers for pre 1.20 APIs.

+func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {

+	container, err := daemon.GetContainer(name)

+	if err != nil {

+		return nil, err

+	}

+

+	container.Lock()

+	defer container.Unlock()

+

+	base, err := daemon.getInspectData(container)

+	if err != nil {

+		return nil, err

+	}

+

+	volumes := make(map[string]string)

+	volumesRW := make(map[string]bool)

+	for _, m := range container.MountPoints {

+		volumes[m.Destination] = m.Path()

+		volumesRW[m.Destination] = m.RW

+	}

+

+	config := &v1p19.ContainerConfig{

+		Config:          container.Config,

+		MacAddress:      container.Config.MacAddress,

+		NetworkDisabled: container.Config.NetworkDisabled,

+		ExposedPorts:    container.Config.ExposedPorts,

+		VolumeDriver:    container.HostConfig.VolumeDriver,

+		Memory:          container.HostConfig.Memory,

+		MemorySwap:      container.HostConfig.MemorySwap,

+		CPUShares:       container.HostConfig.CPUShares,

+		CPUSet:          container.HostConfig.CpusetCpus,

+	}

+	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(container.NetworkSettings)

+

+	return &v1p19.ContainerJSON{

+		ContainerJSONBase: base,

+		Volumes:           volumes,

+		VolumesRW:         volumesRW,

+		Config:            config,

+		NetworkSettings:   networkSettings,

+	}, nil

+}

+

+func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {

+	return &backend.ExecProcessConfig{

+		Tty:        e.Tty,

+		Entrypoint: e.Entrypoint,

+		Arguments:  e.Args,

+		Privileged: &e.Privileged,

+		User:       e.User,

+	}

+}

deleted file mode 100644

@@ -1,27 +0,0 @@

-package daemon

-

-import (

-	"github.com/docker/docker/api/types"

-	"github.com/docker/docker/api/types/backend"

-	"github.com/docker/docker/api/types/versions/v1p19"

-	"github.com/docker/docker/container"

-	"github.com/docker/docker/daemon/exec"

-)

-

-// This sets platform-specific fields

-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {

-	return contJSONBase

-}

-

-// containerInspectPre120 get containers for pre 1.20 APIs.

-func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {

-	return &v1p19.ContainerJSON{}, nil

-}

-

-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {

-	return &backend.ExecProcessConfig{

-		Tty:        e.Tty,

-		Entrypoint: e.Entrypoint,

-		Arguments:  e.Args,

-	}

-}

deleted file mode 100644

@@ -1,75 +0,0 @@

-// +build !windows

-

-package daemon

-

-import (

-	"github.com/docker/docker/api/types"

-	"github.com/docker/docker/api/types/backend"

-	"github.com/docker/docker/api/types/versions/v1p19"

-	"github.com/docker/docker/container"

-	"github.com/docker/docker/daemon/exec"

-)

-

-// This sets platform-specific fields

-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {

-	contJSONBase.AppArmorProfile = container.AppArmorProfile

-	contJSONBase.ResolvConfPath = container.ResolvConfPath

-	contJSONBase.HostnamePath = container.HostnamePath

-	contJSONBase.HostsPath = container.HostsPath

-

-	return contJSONBase

-}

-

-// containerInspectPre120 gets containers for pre 1.20 APIs.

-func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {

-	container, err := daemon.GetContainer(name)

-	if err != nil {

-		return nil, err

-	}

-

-	container.Lock()

-	defer container.Unlock()

-

-	base, err := daemon.getInspectData(container)

-	if err != nil {

-		return nil, err

-	}

-

-	volumes := make(map[string]string)

-	volumesRW := make(map[string]bool)

-	for _, m := range container.MountPoints {

-		volumes[m.Destination] = m.Path()

-		volumesRW[m.Destination] = m.RW

-	}

-

-	config := &v1p19.ContainerConfig{

-		Config:          container.Config,

-		MacAddress:      container.Config.MacAddress,

-		NetworkDisabled: container.Config.NetworkDisabled,

-		ExposedPorts:    container.Config.ExposedPorts,

-		VolumeDriver:    container.HostConfig.VolumeDriver,

-		Memory:          container.HostConfig.Memory,

-		MemorySwap:      container.HostConfig.MemorySwap,

-		CPUShares:       container.HostConfig.CPUShares,

-		CPUSet:          container.HostConfig.CpusetCpus,

-	}

-	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(container.NetworkSettings)

-

-	return &v1p19.ContainerJSON{

-		ContainerJSONBase: base,

-		Volumes:           volumes,

-		VolumesRW:         volumesRW,

-		Config:            config,

-		NetworkSettings:   networkSettings,

-	}, nil

-}

-

-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {

-	return &backend.ExecProcessConfig{

-		Tty:        e.Tty,

-		Entrypoint: e.Entrypoint,

-		Arguments:  e.Args,

-		Privileged: &e.Privileged,

-		User:       e.User,

-	}

-}

new file mode 100644

@@ -0,0 +1,102 @@

+package listeners

+

+import (

+	"crypto/tls"

+	"fmt"

+	"net"

+	"os"

+	"strconv"

+

+	"github.com/coreos/go-systemd/activation"

+	"github.com/docker/go-connections/sockets"

+	"github.com/sirupsen/logrus"

+)

+

+// Init creates new listeners for the server.

+// TODO: Clean up the fact that socketGroup and tlsConfig aren't always used.

+func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listener, error) {

+	ls := []net.Listener{}

+

+	switch proto {

+	case "fd":

+		fds, err := listenFD(addr, tlsConfig)

+		if err != nil {

+			return nil, err

+		}

+		ls = append(ls, fds...)

+	case "tcp":

+		l, err := sockets.NewTCPSocket(addr, tlsConfig)

+		if err != nil {

+			return nil, err

+		}

+		ls = append(ls, l)

+	case "unix":

+		gid, err := lookupGID(socketGroup)

+		if err != nil {

+			if socketGroup != "" {

+				if socketGroup != defaultSocketGroup {

+					return nil, err

+				}

+				logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err)

+			}

+			gid = os.Getgid()

+		}

+		l, err := sockets.NewUnixSocket(addr, gid)

+		if err != nil {

+			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)

+		}

+		ls = append(ls, l)

+	default:

+		return nil, fmt.Errorf("invalid protocol format: %q", proto)

+	}

+

+	return ls, nil

+}

+

+// listenFD returns the specified socket activated files as a slice of

+// net.Listeners or all of the activated files if "*" is given.

+func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {

+	var (

+		err       error

+		listeners []net.Listener

+	)

+	// socket activation

+	if tlsConfig != nil {

+		listeners, err = activation.TLSListeners(false, tlsConfig)

+	} else {

+		listeners, err = activation.Listeners(false)

+	}

+	if err != nil {

+		return nil, err

+	}

+

+	if len(listeners) == 0 {

+		return nil, fmt.Errorf("no sockets found via socket activation: make sure the service was started by systemd")

+	}

+

+	// default to all fds just like unix:// and tcp://

+	if addr == "" || addr == "*" {

+		return listeners, nil

+	}

+

+	fdNum, err := strconv.Atoi(addr)

+	if err != nil {

+		return nil, fmt.Errorf("failed to parse systemd fd address: should be a number: %v", addr)

+	}

+	fdOffset := fdNum - 3

+	if len(listeners) < fdOffset+1 {

+		return nil, fmt.Errorf("too few socket activated files passed in by systemd")

+	}

+	if listeners[fdOffset] == nil {

+		return nil, fmt.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3)

+	}

+	for i, ls := range listeners {

+		if i == fdOffset || ls == nil {

+			continue

+		}

+		if err := ls.Close(); err != nil {

+			return nil, fmt.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)

+		}

+	}

+	return []net.Listener{listeners[fdOffset]}, nil

+}

deleted file mode 100644

@@ -1,43 +0,0 @@

-package listeners

-

-import (

-	"crypto/tls"

-	"fmt"

-	"net"

-	"os"

-

-	"github.com/docker/go-connections/sockets"

-	"github.com/sirupsen/logrus"

-)

-

-// Init creates new listeners for the server.

-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) (ls []net.Listener, err error) {

-	switch proto {

-	case "tcp":

-		l, err := sockets.NewTCPSocket(addr, tlsConfig)

-		if err != nil {

-			return nil, err

-		}

-		ls = append(ls, l)

-	case "unix":

-		gid, err := lookupGID(socketGroup)

-		if err != nil {

-			if socketGroup != "" {

-				if socketGroup != defaultSocketGroup {

-					return nil, err

-				}

-				logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err)

-			}

-			gid = os.Getgid()

-		}

-		l, err := sockets.NewUnixSocket(addr, gid)

-		if err != nil {

-			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)

-		}

-		ls = append(ls, l)

-	default:

-		return nil, fmt.Errorf("Invalid protocol format: %q", proto)

-	}

-

-	return

-}

deleted file mode 100644

@@ -1,104 +0,0 @@

-// +build !windows

-

-package listeners

-

-import (

-	"crypto/tls"

-	"fmt"

-	"net"

-	"os"

-	"strconv"

-

-	"github.com/coreos/go-systemd/activation"

-	"github.com/docker/go-connections/sockets"

-	"github.com/sirupsen/logrus"

-)

-

-// Init creates new listeners for the server.

-// TODO: Clean up the fact that socketGroup and tlsConfig aren't always used.

-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listener, error) {

-	ls := []net.Listener{}

-

-	switch proto {

-	case "fd":

-		fds, err := listenFD(addr, tlsConfig)

-		if err != nil {

-			return nil, err

-		}

-		ls = append(ls, fds...)

-	case "tcp":

-		l, err := sockets.NewTCPSocket(addr, tlsConfig)

-		if err != nil {

-			return nil, err

-		}

-		ls = append(ls, l)

-	case "unix":

-		gid, err := lookupGID(socketGroup)

-		if err != nil {

-			if socketGroup != "" {

-				if socketGroup != defaultSocketGroup {

-					return nil, err

-				}

-				logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err)

-			}

-			gid = os.Getgid()

-		}

-		l, err := sockets.NewUnixSocket(addr, gid)

-		if err != nil {

-			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)

-		}

-		ls = append(ls, l)

-	default:

-		return nil, fmt.Errorf("invalid protocol format: %q", proto)

-	}

-

-	return ls, nil

-}

-

-// listenFD returns the specified socket activated files as a slice of

-// net.Listeners or all of the activated files if "*" is given.

-func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {

-	var (

-		err       error

-		listeners []net.Listener

-	)

-	// socket activation

-	if tlsConfig != nil {

-		listeners, err = activation.TLSListeners(false, tlsConfig)

-	} else {

-		listeners, err = activation.Listeners(false)

-	}

-	if err != nil {

-		return nil, err

-	}

-

-	if len(listeners) == 0 {

-		return nil, fmt.Errorf("no sockets found via socket activation: make sure the service was started by systemd")

-	}

-

-	// default to all fds just like unix:// and tcp://

-	if addr == "" || addr == "*" {

-		return listeners, nil

-	}

-

-	fdNum, err := strconv.Atoi(addr)

-	if err != nil {

-		return nil, fmt.Errorf("failed to parse systemd fd address: should be a number: %v", addr)

-	}

-	fdOffset := fdNum - 3

-	if len(listeners) < fdOffset+1 {

-		return nil, fmt.Errorf("too few socket activated files passed in by systemd")

-	}

-	if listeners[fdOffset] == nil {

-		return nil, fmt.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3)

-	}

-	for i, ls := range listeners {

-		if i == fdOffset || ls == nil {

-			continue

-		}

-		if err := ls.Close(); err != nil {

-			return nil, fmt.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)

-		}

-	}

-	return []net.Listener{listeners[fdOffset]}, nil

-}

deleted file mode 100644

@@ -1,11 +0,0 @@

-package daemon

-

-import (

-	"github.com/docker/docker/container"

-	"github.com/docker/docker/libcontainerd"

-)

-

-// postRunProcessing perfoms any processing needed on the container after it has stopped.

-func (daemon *Daemon) postRunProcessing(_ *container.Container, _ libcontainerd.EventInfo) error {

-	return nil

-}

@@ -1,5 +1,3 @@

-// +build linux

-

 package daemon

 import (

deleted file mode 100644

@@ -1,11 +0,0 @@

-package daemon

-

-import (

-	"github.com/docker/docker/api/types/container"

-	"github.com/docker/docker/libcontainerd"

-)

-

-func toContainerdResources(resources container.Resources) libcontainerd.Resources {

-	var r libcontainerd.Resources

-	return r

-}

@@ -1,5 +1,3 @@

-// +build windows

-

 package daemon

 import (

@@ -1,5 +1,3 @@

-// +build linux

-

 package plugin

 import (

deleted file mode 100644

@@ -1,30 +0,0 @@

-package plugin

-

-import (

-	"fmt"

-

-	"github.com/docker/docker/plugin/v2"

-	specs "github.com/opencontainers/runtime-spec/specs-go"

-)

-

-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {

-	return fmt.Errorf("Not implemented")

-}

-

-func (pm *Manager) initSpec(p *v2.Plugin) (*specs.Spec, error) {

-	return nil, fmt.Errorf("Not implemented")

-}

-

-func (pm *Manager) disable(p *v2.Plugin, c *controller) error {

-	return fmt.Errorf("Not implemented")

-}

-

-func (pm *Manager) restore(p *v2.Plugin) error {

-	return fmt.Errorf("Not implemented")

-}

-

-// Shutdown plugins

-func (pm *Manager) Shutdown() {

-}

-

-func setupRoot(root string) error { return nil }

@@ -1,5 +1,3 @@

-// +build windows

-

 package plugin

 import (