deleted file mode 100644

@@ -1,19 +0,0 @@

-# Defines an image that hosts a native Docker build environment for Solaris

-# TODO: Improve stub

-

-FROM solaris:latest

-

-# compile and runtime deps

-RUN pkg install --accept \

-		git \

-		gnu-coreutils \

-		gnu-make \

-		gnu-tar \

-		diagnostic/top \

-		golang \

-		library/golang/* \

-		developer/gcc-*

-

-ENV GOPATH /go/:/usr/lib/gocode/1.5/

-WORKDIR /go/src/github.com/docker/docker

-COPY . /go/src/github.com/docker/docker

@@ -3,7 +3,6 @@

 package main

 import (

-	"runtime"

 	"testing"

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

@@ -12,9 +11,6 @@ import (

 )

 func TestDaemonParseShmSize(t *testing.T) {

-	if runtime.GOOS == "solaris" {

-		t.Skip("ShmSize not supported on Solaris\n")

-	}

 	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)

 	conf := &config.Config{}

deleted file mode 100644

@@ -1,64 +0,0 @@

-// +build solaris

-

-package main

-

-import (

-	"fmt"

-	"net"

-	"path/filepath"

-

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

-	"golang.org/x/sys/unix"

-)

-

-const defaultDaemonConfigFile = ""

-

-// setDefaultUmask sets the umask to 0022 to avoid problems

-// caused by custom umask

-func setDefaultUmask() error {

-	desiredUmask := 0022

-	unix.Umask(desiredUmask)

-	if umask := unix.Umask(desiredUmask); umask != desiredUmask {

-		return fmt.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask)

-	}

-

-	return nil

-}

-

-func getDaemonConfDir(_ string) string {

-	return "/etc/docker"

-}

-

-// setupConfigReloadTrap configures the USR2 signal to reload the configuration.

-func (cli *DaemonCli) setupConfigReloadTrap() {

-}

-

-// preNotifySystem sends a message to the host when the API is active, but before the daemon is

-func preNotifySystem() {

-}

-

-// notifySystem sends a message to the host when the server is ready to be used

-func notifySystem() {

-}

-

-func (cli *DaemonCli) getPlatformRemoteOptions() ([]libcontainerd.RemoteOption, error) {

-	return nil, nil

-}

-

-// getSwarmRunRoot gets the root directory for swarm to store runtime state

-// For example, the control socket

-func (cli *DaemonCli) getSwarmRunRoot() string {

-	return filepath.Join(cli.Config.ExecRoot, "swarm")

-}

-

-func allocateDaemonPort(addr string) error {

-	return nil

-}

-

-// notifyShutdown is called after the daemon shuts down but before the process exits.

-func notifyShutdown(err error) {

-}

-

-func wrapListeners(proto string, ls []net.Listener) []net.Listener {

-	return ls

-}

deleted file mode 100644

@@ -1,4 +0,0 @@

-FROM solaris

-EXPOSE 80/tcp

-COPY httpserver .

-CMD ["./httpserver"]

deleted file mode 100644

@@ -1,5 +0,0 @@

-// +build solaris

-

-package daemon

-

-const bindMountType = "lofs"

@@ -129,8 +129,8 @@ func (daemon *Daemon) Commit(name string, c *backend.ContainerCommitConfig) (str

 		return "", err

 	}

-	// It is not possible to commit a running container on Windows and on Solaris.

-	if (runtime.GOOS == "windows" || runtime.GOOS == "solaris") && container.IsRunning() {

+	// It is not possible to commit a running container on Windows

+	if (runtime.GOOS == "windows") && container.IsRunning() {

 		return "", errors.Errorf("%+v does not support commit of a running container", runtime.GOOS)

 	}

@@ -204,9 +204,6 @@ func New() *Config {

 // ParseClusterAdvertiseSettings parses the specified advertise settings

 func ParseClusterAdvertiseSettings(clusterStore, clusterAdvertise string) (string, error) {

-	if runtime.GOOS == "solaris" && (clusterAdvertise != "" || clusterStore != "") {

-		return "", errors.New("Cluster Advertise Settings not supported on Solaris")

-	}

 	if clusterAdvertise == "" {

 		return "", daemondiscovery.ErrDiscoveryDisabled

 	}

@@ -3,7 +3,6 @@ package config

 import (

 	"io/ioutil"

 	"os"

-	"runtime"

 	"strings"

 	"testing"

@@ -38,9 +37,6 @@ func TestDaemonBrokenConfiguration(t *testing.T) {

 }

 func TestParseClusterAdvertiseSettings(t *testing.T) {

-	if runtime.GOOS == "solaris" {

-		t.Skip("ClusterSettings not supported on Solaris\n")

-	}

 	_, err := ParseClusterAdvertiseSettings("something", "")

 	if err != discovery.ErrDiscoveryDisabled {

 		t.Fatalf("expected discovery disabled error, got %v\n", err)

deleted file mode 100644

@@ -1,47 +0,0 @@

-// +build solaris

-

-package daemon

-

-import (

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

-	"github.com/docker/docker/runconfig"

-	"github.com/docker/libnetwork"

-)

-

-func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {

-	return nil, nil

-}

-

-func (daemon *Daemon) setupIpcDirs(container *container.Container) error {

-	return nil

-}

-

-func killProcessDirectly(container *container.Container) error {

-	return nil

-}

-

-func detachMounted(path string) error {

-	return nil

-}

-

-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()]

-	return ok

-}

-

-func enableIPOnPredefinedNetwork() bool {

-	return false

-}

-

-func (daemon *Daemon) isNetworkHotPluggable() bool {

-	return false

-}

-

-func setupPathsAndSandboxOptions(container *container.Container, sboxOptions *[]libnetwork.SandboxOption) error {

-	return nil

-}

-

-func (daemon *Daemon) initializeNetworkingPaths(container *container.Container, nc *container.Container) error {

-	return nil

-}

@@ -96,10 +96,6 @@ func (daemon *Daemon) create(params types.ContainerCreateConfig, managed bool) (

 			return nil, err

 		}

 		os = img.OS

-

-		if runtime.GOOS == "solaris" && img.OS != "solaris " {

-			return nil, errors.New("operating system on which parent image was created is not Solaris")

-		}

 		imgID = img.ID()

 		if runtime.GOOS == "windows" && img.OS == "linux" && !system.LCOWSupported() {

deleted file mode 100644

@@ -1,530 +0,0 @@

-// +build solaris,cgo

-

-package daemon

-

-import (

-	"fmt"

-	"net"

-	"strconv"

-

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

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

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

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

-	"github.com/docker/docker/image"

-	"github.com/docker/docker/pkg/containerfs"

-	"github.com/docker/docker/pkg/fileutils"

-	"github.com/docker/docker/pkg/idtools"

-	"github.com/docker/docker/pkg/parsers/kernel"

-	"github.com/docker/docker/pkg/sysinfo"

-	"github.com/docker/libnetwork"

-	nwconfig "github.com/docker/libnetwork/config"

-	"github.com/docker/libnetwork/drivers/solaris/bridge"

-	"github.com/docker/libnetwork/netlabel"

-	"github.com/docker/libnetwork/netutils"

-	lntypes "github.com/docker/libnetwork/types"

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

-	"github.com/opencontainers/selinux/go-selinux/label"

-	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

-)

-

-//#include <zone.h>

-import "C"

-

-const (

-	platformSupported   = true

-	solarisMinCPUShares = 1

-	solarisMaxCPUShares = 65535

-)

-

-func getMemoryResources(config containertypes.Resources) specs.CappedMemory {

-	memory := specs.CappedMemory{

-		DisableOOMKiller: config.OomKillDisable,

-	}

-

-	if config.Memory > 0 {

-		memory.Physical = strconv.FormatInt(config.Memory, 10)

-	}

-

-	if config.MemorySwap != 0 {

-		memory.Swap = strconv.FormatInt(config.MemorySwap, 10)

-	}

-

-	return memory

-}

-

-func getCPUResources(config containertypes.Resources) specs.CappedCPU {

-	cpu := specs.CappedCPU{}

-

-	if config.CpusetCpus != "" {

-		cpu.Ncpus = config.CpusetCpus

-	}

-

-	return cpu

-}

-

-func (daemon *Daemon) cleanupMountsByID(id string) error {

-	return nil

-}

-

-func (daemon *Daemon) parseSecurityOpt(container *container.Container, hostConfig *containertypes.HostConfig) error {

-	return parseSecurityOpt(container, hostConfig)

-}

-

-func parseSecurityOpt(container *container.Container, config *containertypes.HostConfig) error {

-	//Since hostConfig.SecurityOpt is specifically defined as a "List of string values to

-	//customize labels for MLs systems, such as SELinux"

-	//until we figure out how to map to Trusted Extensions

-	//this is being disabled for now on Solaris

-	var (

-		labelOpts []string

-		err       error

-	)

-

-	if len(config.SecurityOpt) > 0 {

-		return errors.New("Security options are not supported on Solaris")

-	}

-

-	container.ProcessLabel, container.MountLabel, err = label.InitLabels(labelOpts)

-	return err

-}

-

-func setupRemappedRoot(config *config.Config) (*idtools.IDMappings, error) {

-	return nil, nil

-}

-

-func setupDaemonRoot(config *config.Config, rootDir string, rootIDs idtools.IDPair) error {

-	return nil

-}

-

-func (daemon *Daemon) getLayerInit() func(containerfs.ContainerFS) error {

-	return nil

-}

-

-func checkKernel() error {

-	// solaris can rely upon checkSystem() below, we don't skew kernel versions

-	return nil

-}

-

-func (daemon *Daemon) getCgroupDriver() string {

-	return ""

-}

-

-func (daemon *Daemon) adaptContainerSettings(hostConfig *containertypes.HostConfig, adjustCPUShares bool) error {

-	if hostConfig.CPUShares < 0 {

-		logrus.Warnf("Changing requested CPUShares of %d to minimum allowed of %d", hostConfig.CPUShares, solarisMinCPUShares)

-		hostConfig.CPUShares = solarisMinCPUShares

-	} else if hostConfig.CPUShares > solarisMaxCPUShares {

-		logrus.Warnf("Changing requested CPUShares of %d to maximum allowed of %d", hostConfig.CPUShares, solarisMaxCPUShares)

-		hostConfig.CPUShares = solarisMaxCPUShares

-	}

-

-	if hostConfig.Memory > 0 && hostConfig.MemorySwap == 0 {

-		// By default, MemorySwap is set to twice the size of Memory.

-		hostConfig.MemorySwap = hostConfig.Memory * 2

-	}

-

-	if hostConfig.ShmSize != 0 {

-		hostConfig.ShmSize = container.DefaultSHMSize

-	}

-	if hostConfig.OomKillDisable == nil {

-		defaultOomKillDisable := false

-		hostConfig.OomKillDisable = &defaultOomKillDisable

-	}

-

-	return nil

-}

-

-// UsingSystemd returns true if cli option includes native.cgroupdriver=systemd

-func UsingSystemd(config *config.Config) bool {

-	return false

-}

-

-// verifyPlatformContainerSettings performs platform-specific validation of the

-// hostconfig and config structures.

-func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {

-	fixMemorySwappiness(resources)

-	warnings := []string{}

-	sysInfo := sysinfo.New(true)

-	// NOTE: We do not enforce a minimum value for swap limits for zones on Solaris and

-	// therefore we will not do that for Docker container either.

-	if hostConfig.Memory > 0 && !sysInfo.MemoryLimit {

-		warnings = append(warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.")

-		logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")

-		hostConfig.Memory = 0

-		hostConfig.MemorySwap = -1

-	}

-	if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !sysInfo.SwapLimit {

-		warnings = append(warnings, "Your kernel does not support swap limit capabilities, memory limited without swap.")

-		logrus.Warnf("Your kernel does not support swap limit capabilities, memory limited without swap.")

-		hostConfig.MemorySwap = -1

-	}

-	if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {

-		return warnings, fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.")

-	}

-	// Solaris NOTE: We allow and encourage setting the swap without setting the memory limit.

-

-	if hostConfig.MemorySwappiness != nil && !sysInfo.MemorySwappiness {

-		warnings = append(warnings, "Your kernel does not support memory swappiness capabilities, memory swappiness discarded.")

-		logrus.Warnf("Your kernel does not support memory swappiness capabilities, memory swappiness discarded.")

-		hostConfig.MemorySwappiness = nil

-	}

-	if hostConfig.MemoryReservation > 0 && !sysInfo.MemoryReservation {

-		warnings = append(warnings, "Your kernel does not support memory soft limit capabilities. Limitation discarded.")

-		logrus.Warnf("Your kernel does not support memory soft limit capabilities. Limitation discarded.")

-		hostConfig.MemoryReservation = 0

-	}

-	if hostConfig.Memory > 0 && hostConfig.MemoryReservation > 0 && hostConfig.Memory < hostConfig.MemoryReservation {

-		return warnings, fmt.Errorf("Minimum memory limit should be larger than memory reservation limit, see usage.")

-	}

-	if hostConfig.KernelMemory > 0 && !sysInfo.KernelMemory {

-		warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities. Limitation discarded.")

-		logrus.Warnf("Your kernel does not support kernel memory limit capabilities. Limitation discarded.")

-		hostConfig.KernelMemory = 0

-	}

-	if hostConfig.CPUShares != 0 && !sysInfo.CPUShares {

-		warnings = append(warnings, "Your kernel does not support CPU shares. Shares discarded.")

-		logrus.Warnf("Your kernel does not support CPU shares. Shares discarded.")

-		hostConfig.CPUShares = 0

-	}

-	if hostConfig.CPUShares < 0 {

-		warnings = append(warnings, "Invalid CPUShares value. Must be positive. Discarding.")

-		logrus.Warnf("Invalid CPUShares value. Must be positive. Discarding.")

-		hostConfig.CPUQuota = 0

-	}

-	if hostConfig.CPUShares > 0 && !sysinfo.IsCPUSharesAvailable() {

-		warnings = append(warnings, "Global zone default scheduling class not FSS. Discarding shares.")

-		logrus.Warnf("Global zone default scheduling class not FSS. Discarding shares.")

-		hostConfig.CPUShares = 0

-	}

-

-	// Solaris NOTE: Linux does not do negative checking for CPUShares and Quota here. But it makes sense to.

-	if hostConfig.CPUPeriod > 0 && !sysInfo.CPUCfsPeriod {

-		warnings = append(warnings, "Your kernel does not support CPU cfs period. Period discarded.")

-		logrus.Warnf("Your kernel does not support CPU cfs period. Period discarded.")

-		if hostConfig.CPUQuota > 0 {

-			warnings = append(warnings, "Quota will be applied on default period, not period specified.")

-			logrus.Warnf("Quota will be applied on default period, not period specified.")

-		}

-		hostConfig.CPUPeriod = 0

-	}

-	if hostConfig.CPUQuota != 0 && !sysInfo.CPUCfsQuota {

-		warnings = append(warnings, "Your kernel does not support CPU cfs quota. Quota discarded.")

-		logrus.Warnf("Your kernel does not support CPU cfs quota. Quota discarded.")

-		hostConfig.CPUQuota = 0

-	}

-	if hostConfig.CPUQuota < 0 {

-		warnings = append(warnings, "Invalid CPUQuota value. Must be positive. Discarding.")

-		logrus.Warnf("Invalid CPUQuota value. Must be positive. Discarding.")

-		hostConfig.CPUQuota = 0

-	}

-	if (hostConfig.CpusetCpus != "" || hostConfig.CpusetMems != "") && !sysInfo.Cpuset {

-		warnings = append(warnings, "Your kernel does not support cpuset. Cpuset discarded.")

-		logrus.Warnf("Your kernel does not support cpuset. Cpuset discarded.")

-		hostConfig.CpusetCpus = ""

-		hostConfig.CpusetMems = ""

-	}

-	cpusAvailable, err := sysInfo.IsCpusetCpusAvailable(hostConfig.CpusetCpus)

-	if err != nil {

-		return warnings, fmt.Errorf("Invalid value %s for cpuset cpus.", hostConfig.CpusetCpus)

-	}

-	if !cpusAvailable {

-		return warnings, fmt.Errorf("Requested CPUs are not available - requested %s, available: %s.", hostConfig.CpusetCpus, sysInfo.Cpus)

-	}

-	memsAvailable, err := sysInfo.IsCpusetMemsAvailable(hostConfig.CpusetMems)

-	if err != nil {

-		return warnings, fmt.Errorf("Invalid value %s for cpuset mems.", hostConfig.CpusetMems)

-	}

-	if !memsAvailable {

-		return warnings, fmt.Errorf("Requested memory nodes are not available - requested %s, available: %s.", hostConfig.CpusetMems, sysInfo.Mems)

-	}

-	if hostConfig.BlkioWeight > 0 && !sysInfo.BlkioWeight {

-		warnings = append(warnings, "Your kernel does not support Block I/O weight. Weight discarded.")

-		logrus.Warnf("Your kernel does not support Block I/O weight. Weight discarded.")

-		hostConfig.BlkioWeight = 0

-	}

-	if hostConfig.OomKillDisable != nil && !sysInfo.OomKillDisable {

-		*hostConfig.OomKillDisable = false

-		// Don't warn; this is the default setting but only applicable to Linux

-	}

-

-	if sysInfo.IPv4ForwardingDisabled {

-		warnings = append(warnings, "IPv4 forwarding is disabled. Networking will not work.")

-		logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")

-	}

-

-	// Solaris NOTE: We do not allow setting Linux specific options, so check and warn for all of them.

-

-	if hostConfig.CapAdd != nil || hostConfig.CapDrop != nil {

-		warnings = append(warnings, "Adding or dropping kernel capabilities unsupported on Solaris.Discarding capabilities lists.")

-		logrus.Warnf("Adding or dropping kernel capabilities unsupported on Solaris.Discarding capabilities lists.")

-		hostConfig.CapAdd = nil

-		hostConfig.CapDrop = nil

-	}

-

-	if hostConfig.GroupAdd != nil {

-		warnings = append(warnings, "Additional groups unsupported on Solaris.Discarding groups lists.")

-		logrus.Warnf("Additional groups unsupported on Solaris.Discarding groups lists.")

-		hostConfig.GroupAdd = nil

-	}

-

-	if hostConfig.IpcMode != "" {

-		warnings = append(warnings, "IPC namespace assignment unsupported on Solaris.Discarding IPC setting.")

-		logrus.Warnf("IPC namespace assignment unsupported on Solaris.Discarding IPC setting.")

-		hostConfig.IpcMode = ""

-	}

-

-	if hostConfig.PidMode != "" {

-		warnings = append(warnings, "PID namespace setting  unsupported on Solaris. Running container in host PID namespace.")

-		logrus.Warnf("PID namespace setting  unsupported on Solaris. Running container in host PID namespace.")

-		hostConfig.PidMode = ""

-	}

-

-	if hostConfig.Privileged {

-		warnings = append(warnings, "Privileged mode unsupported on Solaris. Discarding privileged mode setting.")

-		logrus.Warnf("Privileged mode unsupported on Solaris. Discarding privileged mode setting.")

-		hostConfig.Privileged = false

-	}

-

-	if hostConfig.UTSMode != "" {

-		warnings = append(warnings, "UTS namespace assignment unsupported on Solaris.Discarding UTS setting.")

-		logrus.Warnf("UTS namespace assignment unsupported on Solaris.Discarding UTS setting.")

-		hostConfig.UTSMode = ""

-	}

-

-	if hostConfig.CgroupParent != "" {

-		warnings = append(warnings, "Specifying Cgroup parent unsupported on Solaris. Discarding cgroup parent setting.")

-		logrus.Warnf("Specifying Cgroup parent unsupported on Solaris. Discarding cgroup parent setting.")

-		hostConfig.CgroupParent = ""

-	}

-

-	if hostConfig.Ulimits != nil {

-		warnings = append(warnings, "Specifying ulimits unsupported on Solaris. Discarding ulimits setting.")

-		logrus.Warnf("Specifying ulimits unsupported on Solaris. Discarding ulimits setting.")

-		hostConfig.Ulimits = nil

-	}

-

-	return warnings, nil

-}

-

-// reloadPlatform updates configuration with platform specific options

-// and updates the passed attributes

-func (daemon *Daemon) reloadPlatform(conf *config.Config, attributes map[string]string) error {

-	return nil

-}

-

-// verifyDaemonSettings performs validation of daemon config struct

-func verifyDaemonSettings(conf *config.Config) error {

-

-	if conf.DefaultRuntime == "" {

-		conf.DefaultRuntime = stockRuntimeName

-	}

-	if conf.Runtimes == nil {

-		conf.Runtimes = make(map[string]types.Runtime)

-	}

-	stockRuntimeOpts := []string{}

-	conf.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts}

-

-	return nil

-}

-

-// checkSystem validates platform-specific requirements

-func checkSystem() error {

-	// check OS version for compatibility, ensure running in global zone

-	var err error

-	var id C.zoneid_t

-

-	if id, err = C.getzoneid(); err != nil {

-		return fmt.Errorf("Exiting. Error getting zone id: %+v", err)

-	}

-	if int(id) != 0 {

-		return fmt.Errorf("Exiting because the Docker daemon is not running in the global zone")

-	}

-

-	v, err := kernel.GetKernelVersion()

-	if kernel.CompareKernelVersion(*v, kernel.VersionInfo{Kernel: 5, Major: 12, Minor: 0}) < 0 {

-		return fmt.Errorf("Your Solaris kernel version: %s doesn't support Docker. Please upgrade to 5.12.0", v.String())

-	}

-	return err

-}

-

-// configureMaxThreads sets the Go runtime max threads threshold

-// which is 90% of the kernel setting from /proc/sys/kernel/threads-max

-func configureMaxThreads(config *config.Config) error {

-	return nil

-}

-

-// configureKernelSecuritySupport configures and validates security support for the kernel

-func configureKernelSecuritySupport(config *config.Config, driverNames []string) error {

-	return nil

-}

-

-func (daemon *Daemon) initNetworkController(config *config.Config, activeSandboxes map[string]interface{}) (libnetwork.NetworkController, error) {

-	netOptions, err := daemon.networkOptions(config, daemon.PluginStore, activeSandboxes)

-	if err != nil {

-		return nil, err

-	}

-

-	controller, err := libnetwork.New(netOptions...)

-	if err != nil {

-		return nil, fmt.Errorf("error obtaining controller instance: %v", err)

-	}

-

-	// Initialize default network on "null"

-	if _, err := controller.NewNetwork("null", "none", "", libnetwork.NetworkOptionPersist(false)); err != nil {

-		return nil, fmt.Errorf("Error creating default 'null' network: %v", err)

-	}

-

-	if !config.DisableBridge {

-		// Initialize default driver "bridge"

-		if err := initBridgeDriver(controller, config); err != nil {

-			return nil, err

-		}

-	}

-

-	return controller, nil

-}

-

-func initBridgeDriver(controller libnetwork.NetworkController, config *config.Config) error {

-	if n, err := controller.NetworkByName("bridge"); err == nil {

-		if err = n.Delete(); err != nil {

-			return fmt.Errorf("could not delete the default bridge network: %v", err)

-		}

-	}

-

-	bridgeName := bridge.DefaultBridgeName

-	if config.bridgeConfig.Iface != "" {

-		bridgeName = config.bridgeConfig.Iface

-	}

-	netOption := map[string]string{

-		bridge.BridgeName:    bridgeName,

-		bridge.DefaultBridge: strconv.FormatBool(true),

-		netlabel.DriverMTU:   strconv.Itoa(config.Mtu),

-		bridge.EnableICC:     strconv.FormatBool(config.bridgeConfig.InterContainerCommunication),

-	}

-

-	// --ip processing

-	if config.bridgeConfig.DefaultIP != nil {

-		netOption[bridge.DefaultBindingIP] = config.bridgeConfig.DefaultIP.String()

-	}

-

-	var ipamV4Conf *libnetwork.IpamConf

-

-	ipamV4Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}

-

-	nwList, _, err := netutils.ElectInterfaceAddresses(bridgeName)

-	if err != nil {

-		return errors.Wrap(err, "list bridge addresses failed")

-	}

-

-	nw := nwList[0]

-	if len(nwList) > 1 && config.bridgeConfig.FixedCIDR != "" {

-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)

-		if err != nil {

-			return errors.Wrap(err, "parse CIDR failed")

-		}

-		// Iterate through in case there are multiple addresses for the bridge

-		for _, entry := range nwList {

-			if fCIDR.Contains(entry.IP) {

-				nw = entry

-				break

-			}

-		}

-	}

-

-	ipamV4Conf.PreferredPool = lntypes.GetIPNetCanonical(nw).String()

-	hip, _ := lntypes.GetHostPartIP(nw.IP, nw.Mask)

-	if hip.IsGlobalUnicast() {

-		ipamV4Conf.Gateway = nw.IP.String()

-	}

-

-	if config.bridgeConfig.IP != "" {

-		ipamV4Conf.PreferredPool = config.bridgeConfig.IP

-		ip, _, err := net.ParseCIDR(config.bridgeConfig.IP)

-		if err != nil {

-			return err

-		}

-		ipamV4Conf.Gateway = ip.String()

-	} else if bridgeName == bridge.DefaultBridgeName && ipamV4Conf.PreferredPool != "" {

-		logrus.Infof("Default bridge (%s) is assigned with an IP address %s. Daemon option --bip can be used to set a preferred IP address", bridgeName, ipamV4Conf.PreferredPool)

-	}

-

-	if config.bridgeConfig.FixedCIDR != "" {

-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)

-		if err != nil {

-			return err

-		}

-

-		ipamV4Conf.SubPool = fCIDR.String()

-	}

-

-	if config.bridgeConfig.DefaultGatewayIPv4 != nil {

-		ipamV4Conf.AuxAddresses["DefaultGatewayIPv4"] = config.bridgeConfig.DefaultGatewayIPv4.String()

-	}

-

-	v4Conf := []*libnetwork.IpamConf{ipamV4Conf}

-	v6Conf := []*libnetwork.IpamConf{}

-

-	// Initialize default network on "bridge" with the same name

-	_, err = controller.NewNetwork("bridge", "bridge", "",

-		libnetwork.NetworkOptionDriverOpts(netOption),

-		libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),

-		libnetwork.NetworkOptionDeferIPv6Alloc(false))

-	if err != nil {

-		return fmt.Errorf("Error creating default 'bridge' network: %v", err)

-	}

-	return nil

-}

-

-// registerLinks sets up links between containers and writes the

-// configuration out for persistence.

-func (daemon *Daemon) registerLinks(container *container.Container, hostConfig *containertypes.HostConfig) error {

-	return nil

-}

-

-func (daemon *Daemon) cleanupMounts() error {

-	return nil

-}

-

-// conditionalMountOnStart is a platform specific helper function during the

-// container start to call mount.

-func (daemon *Daemon) conditionalMountOnStart(container *container.Container) error {

-	return daemon.Mount(container)

-}

-

-// conditionalUnmountOnCleanup is a platform specific helper function called

-// during the cleanup of a container to unmount.

-func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container) error {

-	return daemon.Unmount(container)

-}

-

-func driverOptions(config *config.Config) []nwconfig.Option {

-	return []nwconfig.Option{}

-}

-

-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

-	return nil, nil

-}

-

-// setDefaultIsolation determine the default isolation mode for the

-// daemon to run in. This is only applicable on Windows

-func (daemon *Daemon) setDefaultIsolation() error {

-	return nil

-}

-

-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {

-	return types.RootFS{}

-}

-

-func setupDaemonProcess(config *config.Config) error {

-	return nil

-}

-

-func (daemon *Daemon) setupSeccompProfile() error {

-	return nil

-}

-

-func getRealPath(path string) (string, error) {

-	return fileutils.ReadSymlinkedDirectory(path)

-}

deleted file mode 100644

@@ -1,96 +0,0 @@

-// +build solaris,cgo

-

-package graphdriver

-

-/*

-#include <sys/statvfs.h>

-#include <stdlib.h>

-

-static inline struct statvfs *getstatfs(char *s) {

-        struct statvfs *buf;

-        int err;

-        buf = (struct statvfs *)malloc(sizeof(struct statvfs));

-        err = statvfs(s, buf);

-        return buf;

-}

-*/

-import "C"

-import (

-	"path/filepath"

-	"unsafe"

-

-	"github.com/docker/docker/pkg/mount"

-	"github.com/sirupsen/logrus"

-)

-

-const (

-	// FsMagicZfs filesystem id for Zfs

-	FsMagicZfs = FsMagic(0x2fc12fc1)

-)

-

-var (

-	// Slice of drivers that should be used in an order

-	priority = []string{

-		"zfs",

-	}

-

-	// FsNames maps filesystem id to name of the filesystem.

-	FsNames = map[FsMagic]string{

-		FsMagicZfs: "zfs",

-	}

-)

-

-// GetFSMagic returns the filesystem id given the path.

-func GetFSMagic(rootpath string) (FsMagic, error) {

-	return 0, nil

-}

-

-type fsChecker struct {

-	t FsMagic

-}

-

-func (c *fsChecker) IsMounted(path string) bool {

-	m, _ := Mounted(c.t, path)

-	return m

-}

-

-// NewFsChecker returns a checker configured for the provided FsMagic

-func NewFsChecker(t FsMagic) Checker {

-	return &fsChecker{

-		t: t,

-	}

-}

-

-// NewDefaultChecker returns a check that parses /proc/mountinfo to check

-// if the specified path is mounted.

-// No-op on Solaris.

-func NewDefaultChecker() Checker {

-	return &defaultChecker{}

-}

-

-type defaultChecker struct {

-}

-

-func (c *defaultChecker) IsMounted(path string) bool {

-	m, _ := mount.Mounted(path)

-	return m

-}

-

-// Mounted checks if the given path is mounted as the fs type

-//Solaris supports only ZFS for now

-func Mounted(fsType FsMagic, mountPath string) (bool, error) {

-

-	cs := C.CString(filepath.Dir(mountPath))

-	defer C.free(unsafe.Pointer(cs))

-	buf := C.getstatfs(cs)

-	defer C.free(unsafe.Pointer(buf))

-

-	// on Solaris buf.f_basetype contains ['z', 'f', 's', 0 ... ]

-	if (buf.f_basetype[0] != 122) || (buf.f_basetype[1] != 102) || (buf.f_basetype[2] != 115) ||

-		(buf.f_basetype[3] != 0) {

-		logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", mountPath)

-		return false, ErrPrerequisites

-	}

-

-	return true, nil

-}

deleted file mode 100644

@@ -1,58 +0,0 @@

-// +build solaris,cgo

-

-package zfs

-