@@ -137,7 +137,8 @@ ENV DOCKER_CROSSPLATFORMS \

 	linux/386 linux/arm \

 	darwin/amd64 \

 	freebsd/amd64 freebsd/386 freebsd/arm \

-	windows/amd64 windows/386

+	windows/amd64 windows/386 \

+	solaris/amd64

 # Dependency for golint

 ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3

new file mode 100644

@@ -0,0 +1,20 @@

+# 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/

+ENV DOCKER_CROSSPLATFORMS solaris/amd64

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

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

@@ -52,6 +52,11 @@ func notifySystem() {

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

 	opts := []libcontainerd.RemoteOption{}

+	if cli.Config.ContainerdAddr != "" {

+		opts = append(opts, libcontainerd.WithRemoteAddr(cli.Config.ContainerdAddr))

+	} else {

+		opts = append(opts, libcontainerd.WithStartDaemon(true))

+	}

 	return opts

 }

@@ -1,13 +1,15 @@

-// +build !windows

+// +build !windows,!solaris

+

+// TODO: Create new file for Solaris which tests config parameters

+// as described in daemon/config_solaris.go

 package main

 import (

-	"testing"

-

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/pkg/testutil/assert"

 	"github.com/docker/docker/pkg/testutil/tempfile"

+	"testing"

 )

 func TestLoadDaemonCliConfigWithDaemonFlags(t *testing.T) {

new file mode 100644

@@ -0,0 +1,9 @@

+package container

+

+import (

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

+)

+

+func detachMounted(path string) error {

+	return unix.Unmount(path, unix.MNT_DETACH)

+}

new file mode 100644

@@ -0,0 +1,13 @@

+// +build solaris freebsd

+

+package container

+

+import (

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

+)

+

+func detachMounted(path string) error {

+	//Solaris and FreeBSD do not support the lazy unmount or MNT_DETACH feature.

+	// Therefore there are separate definitions for this.

+	return unix.Unmount(path, 0)

+}

deleted file mode 100644

@@ -1,100 +0,0 @@

-// +build solaris

-

-package container

-

-import (

-	"os"

-	"path/filepath"

-

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

-	"github.com/docker/docker/volume"

-)

-

-// Container holds fields specific to the Solaris implementation. See

-// CommonContainer for standard fields common to all containers.

-type Container struct {

-	CommonContainer

-

-	// fields below here are platform specific.

-	HostnamePath   string

-	HostsPath      string

-	ResolvConfPath string

-}

-

-// ExitStatus provides exit reasons for a container.

-type ExitStatus struct {

-	// The exit code with which the container exited.

-	ExitCode int

-}

-

-// CreateDaemonEnvironment creates a new environment variable slice for this container.

-func (container *Container) CreateDaemonEnvironment(_ bool, linkedEnv []string) []string {

-	return nil

-}

-

-func appendNetworkMounts(container *Container, volumeMounts []volume.MountPoint) ([]volume.MountPoint, error) {

-	return volumeMounts, nil

-}

-

-// TrySetNetworkMount attempts to set the network mounts given a provided destination and

-// the path to use for it; return true if the given destination was a network mount file

-func (container *Container) TrySetNetworkMount(destination string, path string) bool {

-	return true

-}

-

-// NetworkMounts returns the list of network mounts.

-func (container *Container) NetworkMounts() []Mount {

-	var mount []Mount

-	return mount

-}

-

-// CopyImagePathContent copies files in destination to the volume.

-func (container *Container) CopyImagePathContent(v volume.Volume, destination string) error {

-	return nil

-}

-

-// UnmountIpcMounts unmount Ipc related mounts.

-func (container *Container) UnmountIpcMounts(unmount func(pth string) error) {

-}

-

-// IpcMounts returns the list of Ipc related mounts.

-func (container *Container) IpcMounts() []Mount {

-	return nil

-}

-

-// UpdateContainer updates configuration of a container

-func (container *Container) UpdateContainer(hostConfig *container.HostConfig) error {

-	return nil

-}

-

-// UnmountVolumes explicitly unmounts volumes from the container.

-func (container *Container) UnmountVolumes(forceSyscall bool, volumeEventLog func(name, action string, attributes map[string]string)) error {

-	return nil

-}

-

-// TmpfsMounts returns the list of tmpfs mounts

-func (container *Container) TmpfsMounts() []Mount {

-	var mounts []Mount

-	return mounts

-}

-

-// cleanResourcePath cleans a resource path and prepares to combine with mnt path

-func cleanResourcePath(path string) string {

-	return filepath.Join(string(os.PathSeparator), path)

-}

-

-// BuildHostnameFile writes the container's hostname file.

-func (container *Container) BuildHostnameFile() error {

-	return nil

-}

-

-// canMountFS determines if the file system for the container

-// can be mounted locally. A no-op on non-Windows platforms

-func (container *Container) canMountFS() bool {

-	return true

-}

-

-// EnableServiceDiscoveryOnDefaultNetwork Enable service discovery on default network

-func (container *Container) EnableServiceDiscoveryOnDefaultNetwork() bool {

-	return false

-}

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

-// +build linux freebsd

+// +build linux freebsd solaris

 package container

@@ -8,7 +8,6 @@ import (

 	"os"

 	"path/filepath"

 	"strings"

-	"syscall"

 	"github.com/Sirupsen/logrus"

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

@@ -20,6 +19,7 @@ import (

 	"github.com/docker/docker/utils"

 	"github.com/docker/docker/volume"

 	"github.com/opencontainers/runc/libcontainer/label"

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

 )

 // DefaultSHMSize is the default size (64MB) of the SHM which will be mounted in the container

@@ -200,7 +200,7 @@ func (container *Container) CopyImagePathContent(v volume.Volume, destination st

 			logrus.Warnf("error while unmounting volume %s: %v", v.Name(), err)

 		}

 	}()

-	if err := label.Relabel(path, container.MountLabel, true); err != nil && err != syscall.ENOTSUP {

+	if err := label.Relabel(path, container.MountLabel, true); err != nil && err != unix.ENOTSUP {

 		return err

 	}

 	return copyExistingContents(rootfs, path)

@@ -320,10 +320,6 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfi

 	return nil

 }

-func detachMounted(path string) error {

-	return syscall.Unmount(path, syscall.MNT_DETACH)

-}

-

 // UnmountVolumes unmounts all volumes

 func (container *Container) UnmountVolumes(forceSyscall bool, volumeEventLog func(name, action string, attributes map[string]string)) error {

 	var (

@@ -1,6 +1,8 @@

 package container

-import "sync"

+import (

+	"sync"

+)

 // memoryStore implements a Store in memory.

 type memoryStore struct {

@@ -25,8 +27,9 @@ func (c *memoryStore) Add(id string, cont *Container) {

 // Get returns a container from the store by id.

 func (c *memoryStore) Get(id string) *Container {

+	var res *Container

 	c.RLock()

-	res := c.s[id]

+	res = c.s[id]

 	c.RUnlock()

 	return res

 }

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

-// +build !windows

+// +build !windows,!solaris

 package main

new file mode 100644

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

+FROM solaris

+EXPOSE 80/tcp

+COPY httpserver .

+CMD ["./httpserver"]

@@ -11,11 +11,22 @@ usage() {

 	echo >&2 "       $mkimg -t someuser/centos:5 rinse --distribution centos-5"

 	echo >&2 "       $mkimg -t someuser/mageia:4 mageia-urpmi --version=4"

 	echo >&2 "       $mkimg -t someuser/mageia:4 mageia-urpmi --version=4 --mirror=http://somemirror/"

+	echo >&2 "       $mkimg -t someuser/solaris solaris" 

 	exit 1

 }

 scriptDir="$(dirname "$(readlink -f "$BASH_SOURCE")")/mkimage"

+os=

+os=$(uname -o)

+

+# set up path to gnu tools if solaris

+[[ $os == "Solaris" ]] && export PATH=/usr/gnu/bin:$PATH 

+# TODO check for gnu-tar, gnu-getopt

+

+# TODO requires root/sudo due to some pkg operations. sigh.

+[[ $os == "Solaris" && $EUID != "0" ]] && echo >&2 "image create on Solaris requires superuser privilege"

+

 optTemp=$(getopt --options '+d:t:c:hC' --longoptions 'dir:,tag:,compression:,no-compression,help' --name "$mkimg" -- "$@")

 eval set -- "$optTemp"

 unset optTemp

new file mode 100755

@@ -0,0 +1,89 @@

+#!/usr/bin/env bash

+#

+# Solaris 12 base image build script. 

+#

+set -e

+

+# TODO add optional package publisher origin

+

+rootfsDir="$1"

+shift

+

+# base install

+(

+	set -x

+

+	pkg image-create --full --zone \

+		--facet facet.locale.*=false \

+		--facet facet.locale.POSIX=true \

+		--facet facet.doc=false \

+		--facet facet.doc.*=false \

+		"$rootfsDir"

+

+	pkg -R "$rootfsDir" set-property use-system-repo true

+

+	pkg -R "$rootfsDir" set-property flush-content-cache-on-success true

+

+	pkg -R "$rootfsDir" install core-os

+)

+

+# Lay in stock configuration, set up milestone

+# XXX This all may become optional in a base image

+(

+	# faster to build repository database on tmpfs

+	REPO_DB=/system/volatile/repository.$$

+	export SVCCFG_REPOSITORY=${REPO_DB}

+	export SVCCFG_DOOR_PATH=$rootfsDir/system/volatile/tmp_repo_door

+

+	# Import base manifests. NOTE These are a combination of basic requirement

+	# and gleaned from container milestone manifest. They may change.

+	for m in $rootfsDir/lib/svc/manifest/system/environment.xml \

+		$rootfsDir/lib/svc/manifest/system/svc/global.xml \

+		$rootfsDir/lib/svc/manifest/system/svc/restarter.xml \

+		$rootfsDir/lib/svc/manifest/network/dns/client.xml \

+		$rootfsDir/lib/svc/manifest/system/name-service/switch.xml \

+		$rootfsDir/lib/svc/manifest/system/name-service/cache.xml \

+		$rootfsDir/lib/svc/manifest/milestone/container.xml ; do

+		svccfg import $m

+	done

+

+	# Apply system layer profile, deleting unnecessary dependencies

+	svccfg apply $rootfsDir/etc/svc/profile/generic_container.xml 

+

+	# XXX Even if we keep a repo in the base image, this is definitely optional

+	svccfg apply $rootfsDir/etc/svc/profile/sysconfig/container_sc.xml

+

+	for s in svc:/system/svc/restarter \

+		svc:/system/environment \

+		svc:/network/dns/client \

+		svc:/system/name-service/switch \

+		svc:/system/name-service/cache \

+		svc:/system/svc/global \

+		svc:/milestone/container ;do

+		svccfg -s $s refresh

+	done

+

+	# now copy the built up repository into the base rootfs

+	mv $REPO_DB $rootfsDir/etc/svc/repository.db

+)

+

+# pkg(1) needs the zoneproxy-client running in the container.

+# use a simple wrapper to run it as needed.

+# XXX maybe we go back to running this in SMF?

+mv "$rootfsDir/usr/bin/pkg" "$rootfsDir/usr/bin/wrapped_pkg"

+cat > "$rootfsDir/usr/bin/pkg" <<-'EOF'

+#!/bin/sh

+#

+# THIS FILE CREATED DURING DOCKER BASE IMAGE CREATION

+# 

+# The Solaris base image uses the sysrepo proxy mechanism. The

+# IPS client pkg(1) requires the zoneproxy-client to reach the

+# remote publisher origins through the host. This wrapper script

+# enables and disables the proxy client as needed. This is a

+# temporary solution.

+

+/usr/lib/zones/zoneproxy-client -s localhost:1008

+PKG_SYSREPO_URL=http://localhost:1008 /usr/bin/wrapped_pkg "$@"

+pkill -9 zoneproxy-client

+EOF

+chmod +x "$rootfsDir/usr/bin/pkg"

new file mode 100644

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

+// +build solaris

+

+package daemon

+

+const bindMountType = "lofs"

new file mode 100644

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

+// +build linux freebsd

+

+package daemon

+

+const bindMountType = "bind"

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

-// +build !linux

+// +build !linux,!solaris

 package cluster

new file mode 100644

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

+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

+}

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

 		return "", err

 	}

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

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

-		return "", fmt.Errorf("Windows does not support commit of a running container")

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

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

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

 	}

 	if c.Pause && !container.IsPaused() {

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

 import (

 	"bytes"

 	"encoding/json"

+	"errors"

 	"fmt"

 	"io"

 	"io/ioutil"

@@ -221,6 +222,9 @@ func NewConfig() *Config {

 }

 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 "", errDiscoveryDisabled

 	}

new file mode 100644

@@ -0,0 +1,80 @@

+// +build solaris linux freebsd

+

+package daemon

+

+import (

+	"net"

+

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

+	"github.com/docker/docker/opts"

+	runconfigopts "github.com/docker/docker/runconfig/opts"

+	"github.com/spf13/pflag"

+)

+

+// CommonUnixConfig defines configuration of a docker daemon that is

+// common across Unix platforms.

+type CommonUnixConfig struct {

+	ExecRoot       string                   `json:"exec-root,omitempty"`

+	ContainerdAddr string                   `json:"containerd,omitempty"`

+	Runtimes       map[string]types.Runtime `json:"runtimes,omitempty"`

+	DefaultRuntime string                   `json:"default-runtime,omitempty"`

+}

+

+type commonUnixBridgeConfig struct {

+	DefaultIP                   net.IP `json:"ip,omitempty"`

+	IP                          string `json:"bip,omitempty"`

+	DefaultGatewayIPv4          net.IP `json:"default-gateway,omitempty"`

+	DefaultGatewayIPv6          net.IP `json:"default-gateway-v6,omitempty"`

+	InterContainerCommunication bool   `json:"icc,omitempty"`

+}

+

+// InstallCommonUnixFlags adds command-line options to the top-level flag parser for

+// the current process that are common across Unix platforms.

+func (config *Config) InstallCommonUnixFlags(flags *pflag.FlagSet) {

+	config.Runtimes = make(map[string]types.Runtime)

+

+	flags.StringVarP(&config.SocketGroup, "group", "G", "docker", "Group for the unix socket")

+	flags.StringVar(&config.bridgeConfig.IP, "bip", "", "Specify network bridge IP")

+	flags.StringVarP(&config.bridgeConfig.Iface, "bridge", "b", "", "Attach containers to a network bridge")

+	flags.StringVar(&config.bridgeConfig.FixedCIDR, "fixed-cidr", "", "IPv4 subnet for fixed IPs")

+	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv4, ""), "default-gateway", "Container default gateway IPv4 address")

+	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv6, ""), "default-gateway-v6", "Container default gateway IPv6 address")

+	flags.BoolVar(&config.bridgeConfig.InterContainerCommunication, "icc", true, "Enable inter-container communication")

+	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultIP, "0.0.0.0"), "ip", "Default IP when binding container ports")

+	flags.Var(runconfigopts.NewNamedRuntimeOpt("runtimes", &config.Runtimes, stockRuntimeName), "add-runtime", "Register an additional OCI compatible runtime")

+	flags.StringVar(&config.DefaultRuntime, "default-runtime", stockRuntimeName, "Default OCI runtime for containers")

+

+}

+

+// GetRuntime returns the runtime path and arguments for a given

+// runtime name

+func (config *Config) GetRuntime(name string) *types.Runtime {

+	config.reloadLock.Lock()

+	defer config.reloadLock.Unlock()

+	if rt, ok := config.Runtimes[name]; ok {

+		return &rt

+	}

+	return nil

+}

+

+// GetDefaultRuntimeName returns the current default runtime

+func (config *Config) GetDefaultRuntimeName() string {

+	config.reloadLock.Lock()

+	rt := config.DefaultRuntime

+	config.reloadLock.Unlock()

+

+	return rt

+}

+

+// GetAllRuntimes returns a copy of the runtimes map

+func (config *Config) GetAllRuntimes() map[string]types.Runtime {

+	config.reloadLock.Lock()

+	rts := config.Runtimes

+	config.reloadLock.Unlock()

+	return rts

+}

+

+// GetExecRoot returns the user configured Exec-root

+func (config *Config) GetExecRoot() string {

+	return config.ExecRoot

+}

@@ -5,7 +5,7 @@ import (

 )

 var (

-	defaultPidFile = "/var/run/docker.pid"

+	defaultPidFile = "/system/volatile/docker/docker.pid"

 	defaultGraph   = "/var/lib/docker"

 	defaultExec    = "zones"

 )

@@ -16,14 +16,17 @@ var (

 type Config struct {

 	CommonConfig

-	// Fields below here are platform specific.

-	ExecRoot string `json:"exec-root,omitempty"`

+	// 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

 }

 // InstallFlags adds command-line options to the top-level flag parser for

@@ -32,14 +35,13 @@ func (config *Config) InstallFlags(flags *pflag.FlagSet) {

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

 	config.InstallCommonFlags(flags)

+	// Then install flags common to unix platforms

+	config.InstallCommonUnixFlags(flags)

+

 	// Then platform-specific install flags

 	config.attachExperimentalFlags(flags)

 }

-// GetExecRoot returns the user configured Exec-root

-func (config *Config) GetExecRoot() string {

-	return config.ExecRoot

-}

 func (config *Config) isSwarmCompatible() error {

 	return nil

 }

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

 import (

 	"io/ioutil"

 	"os"

+	"runtime"

 	"strings"

 	"testing"

@@ -35,6 +36,9 @@ 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 != errDiscoveryDisabled {

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

@@ -4,10 +4,7 @@ package daemon

 import (

 	"fmt"

-	"net"

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

-	"github.com/docker/docker/opts"

 	runconfigopts "github.com/docker/docker/runconfig/opts"

 	units "github.com/docker/go-units"

 	"github.com/spf13/pflag"

@@ -25,15 +22,14 @@ var (

 type Config struct {

 	CommonConfig

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

+	CommonUnixConfig

+

 	// Fields below here are platform specific.

 	CgroupParent         string                   `json:"cgroup-parent,omitempty"`

-	ContainerdAddr       string                   `json:"containerd,omitempty"`

 	EnableSelinuxSupport bool                     `json:"selinux-enabled,omitempty"`

-	ExecRoot             string                   `json:"exec-root,omitempty"`

 	RemappedRoot         string                   `json:"userns-remap,omitempty"`

 	Ulimits              map[string]*units.Ulimit `json:"default-ulimits,omitempty"`

-	Runtimes             map[string]types.Runtime `json:"runtimes,omitempty"`

-	DefaultRuntime       string                   `json:"default-runtime,omitempty"`

 	CPURealtimePeriod    int64                    `json:"cpu-rt-period,omitempty"`

 	CPURealtimeRuntime   int64                    `json:"cpu-rt-runtime,omitempty"`

 	OOMScoreAdjust       int                      `json:"oom-score-adjust,omitempty"`

@@ -47,19 +43,17 @@ type Config struct {

 type bridgeConfig struct {

 	commonBridgeConfig

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

+	commonUnixBridgeConfig

+

 	// Fields below here are platform specific.

-	EnableIPv6                  bool   `json:"ipv6,omitempty"`

-	EnableIPTables              bool   `json:"iptables,omitempty"`

-	EnableIPForward             bool   `json:"ip-forward,omitempty"`

-	EnableIPMasq                bool   `json:"ip-masq,omitempty"`

-	EnableUserlandProxy         bool   `json:"userland-proxy,omitempty"`

-	UserlandProxyPath           string `json:"userland-proxy-path,omitempty"`

-	DefaultIP                   net.IP `json:"ip,omitempty"`

-	IP                          string `json:"bip,omitempty"`

-	FixedCIDRv6                 string `json:"fixed-cidr-v6,omitempty"`

-	DefaultGatewayIPv4          net.IP `json:"default-gateway,omitempty"`

-	DefaultGatewayIPv6          net.IP `json:"default-gateway-v6,omitempty"`

-	InterContainerCommunication bool   `json:"icc,omitempty"`

+	EnableIPv6          bool   `json:"ipv6,omitempty"`

+	EnableIPTables      bool   `json:"iptables,omitempty"`

+	EnableIPForward     bool   `json:"ip-forward,omitempty"`

+	EnableIPMasq        bool   `json:"ip-masq,omitempty"`

+	EnableUserlandProxy bool   `json:"userland-proxy,omitempty"`

+	UserlandProxyPath   string `json:"userland-proxy-path,omitempty"`

+	FixedCIDRv6         string `json:"fixed-cidr-v6,omitempty"`

 }

 // InstallFlags adds flags to the pflag.FlagSet to configure the daemon

@@ -67,26 +61,20 @@ func (config *Config) InstallFlags(flags *pflag.FlagSet) {

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

 	config.InstallCommonFlags(flags)

+	// Then install flags common to unix platforms

+	config.InstallCommonUnixFlags(flags)

+

 	config.Ulimits = make(map[string]*units.Ulimit)

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

 	// Then platform-specific install flags

 	flags.BoolVar(&config.EnableSelinuxSupport, "selinux-enabled", false, "Enable selinux support")

-	flags.StringVarP(&config.SocketGroup, "group", "G", "docker", "Group for the unix socket")

 	flags.Var(runconfigopts.NewUlimitOpt(&config.Ulimits), "default-ulimit", "Default ulimits for containers")

 	flags.BoolVar(&config.bridgeConfig.EnableIPTables, "iptables", true, "Enable addition of iptables rules")

 	flags.BoolVar(&config.bridgeConfig.EnableIPForward, "ip-forward", true, "Enable net.ipv4.ip_forward")

 	flags.BoolVar(&config.bridgeConfig.EnableIPMasq, "ip-masq", true, "Enable IP masquerading")

 	flags.BoolVar(&config.bridgeConfig.EnableIPv6, "ipv6", false, "Enable IPv6 networking")

 	flags.StringVar(&config.ExecRoot, "exec-root", defaultExecRoot, "Root directory for execution state files")

-	flags.StringVar(&config.bridgeConfig.IP, "bip", "", "Specify network bridge IP")

-	flags.StringVarP(&config.bridgeConfig.Iface, "bridge", "b", "", "Attach containers to a network bridge")

-	flags.StringVar(&config.bridgeConfig.FixedCIDR, "fixed-cidr", "", "IPv4 subnet for fixed IPs")

 	flags.StringVar(&config.bridgeConfig.FixedCIDRv6, "fixed-cidr-v6", "", "IPv6 subnet for fixed IPs")

-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv4, ""), "default-gateway", "Container default gateway IPv4 address")

-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv6, ""), "default-gateway-v6", "Container default gateway IPv6 address")

-	flags.BoolVar(&config.bridgeConfig.InterContainerCommunication, "icc", true, "Enable inter-container communication")

-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultIP, "0.0.0.0"), "ip", "Default IP when binding container ports")

 	flags.BoolVar(&config.bridgeConfig.EnableUserlandProxy, "userland-proxy", true, "Use userland proxy for loopback traffic")

 	flags.StringVar(&config.bridgeConfig.UserlandProxyPath, "userland-proxy-path", "", "Path to the userland proxy binary")

 	flags.BoolVar(&config.EnableCors, "api-enable-cors", false, "Enable CORS headers in the remote API, this is deprecated by --api-cors-header")

@@ -95,8 +83,6 @@ func (config *Config) InstallFlags(flags *pflag.FlagSet) {

 	flags.StringVar(&config.RemappedRoot, "userns-remap", "", "User/Group setting for user namespaces")

 	flags.StringVar(&config.ContainerdAddr, "containerd", "", "Path to containerd socket")

 	flags.BoolVar(&config.LiveRestoreEnabled, "live-restore", false, "Enable live restore of docker when containers are still running")

-	flags.Var(runconfigopts.NewNamedRuntimeOpt("runtimes", &config.Runtimes, stockRuntimeName), "add-runtime", "Register an additional OCI compatible runtime")

-	flags.StringVar(&config.DefaultRuntime, "default-runtime", stockRuntimeName, "Default OCI runtime for containers")

 	flags.IntVar(&config.OOMScoreAdjust, "oom-score-adjust", -500, "Set the oom_score_adj for the daemon")

 	flags.BoolVar(&config.Init, "init", false, "Run an init in the container to forward signals and reap processes")

 	flags.StringVar(&config.InitPath, "init-path", "", "Path to the docker-init binary")

@@ -107,39 +93,6 @@ func (config *Config) InstallFlags(flags *pflag.FlagSet) {

 	config.attachExperimentalFlags(flags)

 }

-// GetRuntime returns the runtime path and arguments for a given

-// runtime name

-func (config *Config) GetRuntime(name string) *types.Runtime {

-	config.reloadLock.Lock()

-	defer config.reloadLock.Unlock()

-	if rt, ok := config.Runtimes[name]; ok {

-		return &rt

-	}

-	return nil

-}

-

-// GetDefaultRuntimeName returns the current default runtime

-func (config *Config) GetDefaultRuntimeName() string {

-	config.reloadLock.Lock()

-	rt := config.DefaultRuntime

-	config.reloadLock.Unlock()

-

-	return rt

-}

-

-// GetAllRuntimes returns a copy of the runtimes map

-func (config *Config) GetAllRuntimes() map[string]types.Runtime {

-	config.reloadLock.Lock()

-	rts := config.Runtimes

-	config.reloadLock.Unlock()

-	return rts

-}

-

-// GetExecRoot returns the user configured Exec-root

-func (config *Config) GetExecRoot() string {

-	return config.ExecRoot

-}

-

 func (config *Config) isSwarmCompatible() error {

 	if config.ClusterStore != "" || config.ClusterAdvertise != "" {

 		return fmt.Errorf("--cluster-store and --cluster-advertise daemon configurations are incompatible with swarm mode")

@@ -2,25 +2,20 @@

 package daemon

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

+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

 }

-// getSize returns real size & virtual size

-func (daemon *Daemon) getSize(container *container.Container) (int64, int64) {

-	return 0, 0

-}

-

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

 	return nil

 }

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

-	return nil

-}

-

 func killProcessDirectly(container *container.Container) error {

 	return nil

 }

@@ -30,9 +25,22 @@ func detachMounted(path string) 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()]

+	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

+}

+