@@ -9,9 +9,9 @@ import (

 	"github.com/docker/docker/api/client/lib"

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

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

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

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

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

 )

 // apiClient is an interface that clients that talk with a docker server must implement.

@@ -19,7 +19,7 @@ type apiClient interface {

 	ClientVersion() string

 	ContainerAttach(options types.ContainerAttachOptions) (types.HijackedResponse, error)

 	ContainerCommit(options types.ContainerCommitOptions) (types.ContainerCommitResponse, error)

-	ContainerCreate(config *runconfig.ContainerConfigWrapper, containerName string) (types.ContainerCreateResponse, error)

+	ContainerCreate(config *container.Config, hostConfig *container.HostConfig, containerName string) (types.ContainerCreateResponse, error)

 	ContainerDiff(containerID string) ([]types.ContainerChange, error)

 	ContainerExecAttach(execID string, config types.ExecConfig) (types.HijackedResponse, error)

 	ContainerExecCreate(config types.ExecConfig) (types.ContainerExecCreateResponse, error)

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

 	"fmt"

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

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

 	Cli "github.com/docker/docker/cli"

 	"github.com/docker/docker/opts"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/reference"

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

 )

 // CmdCommit creates a new image from a container's changes.

@@ -54,9 +54,9 @@ func (cli *DockerCli) CmdCommit(args ...string) error {

 		}

 	}

-	var config *runconfig.Config

+	var config *container.Config

 	if *flConfig != "" {

-		config = &runconfig.Config{}

+		config = &container.Config{}

 		if err := json.Unmarshal([]byte(*flConfig), config); err != nil {

 			return err

 		}

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

 	"github.com/docker/docker/api/client/lib"

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

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

 	Cli "github.com/docker/docker/cli"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/reference"

@@ -78,9 +79,7 @@ func newCIDFile(path string) (*cidFile, error) {

 	return &cidFile{path: path, file: f}, nil

 }

-func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runconfig.HostConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {

-	mergedConfig := runconfig.MergeConfigs(config, hostConfig)

-

+func (cli *DockerCli) createContainer(config *container.Config, hostConfig *container.HostConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {

 	var containerIDFile *cidFile

 	if cidfile != "" {

 		var err error

@@ -108,7 +107,7 @@ func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runc

 	}

 	//create the container

-	response, err := cli.client.ContainerCreate(mergedConfig, name)

+	response, err := cli.client.ContainerCreate(config, hostConfig, name)

 	//if image not found try to pull it

 	if err != nil {

 		if lib.IsErrImageNotFound(err) {

@@ -125,7 +124,7 @@ func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runc

 			}

 			// Retry

 			var retryErr error

-			response, retryErr = cli.client.ContainerCreate(mergedConfig, name)

+			response, retryErr = cli.client.ContainerCreate(config, hostConfig, name)

 			if retryErr != nil {

 				return nil, retryErr

 			}

@@ -6,19 +6,29 @@ import (

 	"strings"

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

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

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

 )

+type configWrapper struct {

+	*container.Config

+	HostConfig *container.HostConfig

+}

+

 // ContainerCreate creates a new container based in the given configuration.

 // It can be associated with a name, but it's not mandatory.

-func (cli *Client) ContainerCreate(config *runconfig.ContainerConfigWrapper, containerName string) (types.ContainerCreateResponse, error) {

+func (cli *Client) ContainerCreate(config *container.Config, hostConfig *container.HostConfig, containerName string) (types.ContainerCreateResponse, error) {

 	var response types.ContainerCreateResponse

 	query := url.Values{}

 	if containerName != "" {

 		query.Set("name", containerName)

 	}

-	serverResp, err := cli.post("/containers/create", query, config, nil)

+	body := configWrapper{

+		Config:     config,

+		HostConfig: hostConfig,

+	}

+

+	serverResp, err := cli.post("/containers/create", query, body, nil)

 	if err != nil {

 		if serverResp != nil && serverResp.statusCode == 404 && strings.Contains(err.Error(), config.Image) {

 			return response, imageNotFoundError{config.Image}

@@ -10,7 +10,7 @@ import (

 	"strings"

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

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

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

 	"github.com/docker/go-units"

 )

@@ -73,7 +73,7 @@ func imageBuildOptionsToQuery(options types.ImageBuildOptions) (url.Values, erro

 		query.Set("pull", "1")

 	}

-	if !runconfig.IsolationLevel.IsDefault(runconfig.IsolationLevel(options.Isolation)) {

+	if !container.IsolationLevel.IsDefault(container.IsolationLevel(options.Isolation)) {

 		query.Set("isolation", options.Isolation)

 	}

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

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/server/httputils"

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

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

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile"

 	"github.com/docker/docker/daemon/daemonbuilder"

@@ -24,7 +25,6 @@ import (

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/ulimit"

 	"github.com/docker/docker/reference"

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

 	"github.com/docker/docker/utils"

 	"golang.org/x/net/context"

 )

@@ -144,8 +144,8 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *

 		buildConfig.ShmSize = &shmSize

 	}

-	if i := runconfig.IsolationLevel(r.FormValue("isolation")); i != "" {

-		if !runconfig.IsolationLevel.IsValid(i) {

+	if i := container.IsolationLevel(r.FormValue("isolation")); i != "" {

+		if !container.IsolationLevel.IsValid(i) {

 			return errf(fmt.Errorf("Unsupported isolation: %q", i))

 		}

 		buildConfig.Isolation = i

@@ -5,11 +5,11 @@ import (

 	"time"

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

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

 	"github.com/docker/docker/daemon"

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

 	"github.com/docker/docker/pkg/archive"

 	"github.com/docker/docker/pkg/version"

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

 )

 // execBackend includes functions to implement to provide exec functionality.

@@ -39,7 +39,7 @@ type stateBackend interface {

 	ContainerResize(name string, height, width int) error

 	ContainerRestart(name string, seconds int) error

 	ContainerRm(name string, config *types.ContainerRmConfig) error

-	ContainerStart(name string, hostConfig *runconfig.HostConfig) error

+	ContainerStart(name string, hostConfig *container.HostConfig) error

 	ContainerStop(name string, seconds int) error

 	ContainerUnpause(name string) error

 	ContainerWait(name string, timeout time.Duration) (int, error)

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

 	"github.com/docker/distribution/registry/api/errcode"

 	"github.com/docker/docker/api/server/httputils"

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

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

 	timetypes "github.com/docker/docker/api/types/time"

 	"github.com/docker/docker/daemon"

 	derr "github.com/docker/docker/errors"

@@ -162,7 +163,7 @@ func (s *containerRouter) postContainersStart(ctx context.Context, w http.Respon

 	// net/http otherwise seems to swallow any headers related to chunked encoding

 	// including r.TransferEncoding

 	// allow a nil body for backwards compatibility

-	var hostConfig *runconfig.HostConfig

+	var hostConfig *container.HostConfig

 	if r.Body != nil && (r.ContentLength > 0 || r.ContentLength == -1) {

 		if err := httputils.CheckForJSON(r); err != nil {

 			return err

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

 	"github.com/docker/distribution/digest"

 	"github.com/docker/docker/api/server/httputils"

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

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

 	"github.com/docker/docker/builder/dockerfile"

 	derr "github.com/docker/docker/errors"

 	"github.com/docker/docker/pkg/ioutils"

@@ -43,7 +44,7 @@ func (s *router) postCommit(ctx context.Context, w http.ResponseWriter, r *http.

 		return err

 	}

 	if c == nil {

-		c = &runconfig.Config{}

+		c = &container.Config{}

 	}

 	if !s.daemon.Exists(cname) {

@@ -162,8 +163,8 @@ func (s *router) postImagesCreate(ctx context.Context, w http.ResponseWriter, r

 		// 'err' MUST NOT be defined within this block, we need any error

 		// generated from the download to be available to the output

 		// stream processing below

-		var newConfig *runconfig.Config

-		newConfig, err = dockerfile.BuildFromConfig(&runconfig.Config{}, r.Form["changes"])

+		var newConfig *container.Config

+		newConfig, err = dockerfile.BuildFromConfig(&container.Config{}, r.Form["changes"])

 		if err != nil {

 			return err

 		}

@@ -5,9 +5,9 @@ import (

 	"io"

 	"net"

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

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

 	"github.com/docker/docker/pkg/ulimit"

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

 )

 // ContainerAttachOptions holds parameters to attach to a container.

@@ -28,7 +28,7 @@ type ContainerCommitOptions struct {

 	Author         string

 	Changes        []string

 	Pause          bool

-	Config         *runconfig.Config

+	Config         *container.Config

 }

 // ContainerExecInspect holds information returned by exec inspect.

@@ -1,18 +1,16 @@

 package types

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

+

 // configs holds structs used for internal communication between the

 // frontend (such as an http server) and the backend (such as the

 // docker daemon).

-import (

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

-)

-

 // ContainerCreateConfig is the parameter set to ContainerCreate()

 type ContainerCreateConfig struct {

 	Name            string

-	Config          *runconfig.Config

-	HostConfig      *runconfig.HostConfig

+	Config          *container.Config

+	HostConfig      *container.HostConfig

 	AdjustCPUShares bool

 }

@@ -33,7 +31,7 @@ type ContainerCommitConfig struct {

 	Comment string

 	// merge container config into commit config before commit

 	MergeConfigs bool

-	Config       *runconfig.Config

+	Config       *container.Config

 }

 // ExecConfig is a small subset of the Config struct that hold the configuration

new file mode 100644

@@ -0,0 +1,38 @@

+package container

+

+import (

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

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

+)

+

+// Config contains the configuration data about a container.

+// It should hold only portable information about the container.

+// Here, "portable" means "independent from the host we are running on".

+// Non-portable information *should* appear in HostConfig.

+// All fields added to this struct must be marked `omitempty` to keep getting

+// predictable hashes from the old `v1Compatibility` configuration.

+type Config struct {

+	Hostname        string                // Hostname

+	Domainname      string                // Domainname

+	User            string                // User that will run the command(s) inside the container

+	AttachStdin     bool                  // Attach the standard input, makes possible user interaction

+	AttachStdout    bool                  // Attach the standard output

+	AttachStderr    bool                  // Attach the standard error

+	ExposedPorts    map[nat.Port]struct{} `json:",omitempty"` // List of exposed ports

+	PublishService  string                `json:",omitempty"` // Name of the network service exposed by the container

+	Tty             bool                  // Attach standard streams to a tty, including stdin if it is not closed.

+	OpenStdin       bool                  // Open stdin

+	StdinOnce       bool                  // If true, close stdin after the 1 attached client disconnects.

+	Env             []string              // List of environment variable to set in the container

+	Cmd             *strslice.StrSlice    // Command to run when starting the container

+	ArgsEscaped     bool                  `json:",omitempty"` // True if command is already escaped (Windows specific)

+	Image           string                // Name of the image as it was passed by the operator (eg. could be symbolic)

+	Volumes         map[string]struct{}   // List of volumes (mounts) used for the container

+	WorkingDir      string                // Current directory (PWD) in the command will be launched

+	Entrypoint      *strslice.StrSlice    // Entrypoint to run when starting the container

+	NetworkDisabled bool                  `json:",omitempty"` // Is network disabled

+	MacAddress      string                `json:",omitempty"` // Mac Address of the container

+	OnBuild         []string              // ONBUILD metadata that were defined on the image Dockerfile

+	Labels          map[string]string     // List of labels set to this container

+	StopSignal      string                `json:",omitempty"` // Signal to stop a container

+}

new file mode 100644

@@ -0,0 +1,228 @@

+package container

+

+import (

+	"strings"

+

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

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

+	"github.com/docker/docker/pkg/ulimit"

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

+)

+

+// NetworkMode represents the container network stack.

+type NetworkMode string

+

+// IsolationLevel represents the isolation level of a container. The supported

+// values are platform specific

+type IsolationLevel string

+

+// IsDefault indicates the default isolation level of a container. On Linux this

+// is the native driver. On Windows, this is a Windows Server Container.

+func (i IsolationLevel) IsDefault() bool {

+	return strings.ToLower(string(i)) == "default" || string(i) == ""

+}

+

+// IpcMode represents the container ipc stack.

+type IpcMode string

+

+// IsPrivate indicates whether the container uses it's private ipc stack.

+func (n IpcMode) IsPrivate() bool {

+	return !(n.IsHost() || n.IsContainer())

+}

+

+// IsHost indicates whether the container uses the host's ipc stack.

+func (n IpcMode) IsHost() bool {

+	return n == "host"

+}

+

+// IsContainer indicates whether the container uses a container's ipc stack.

+func (n IpcMode) IsContainer() bool {

+	parts := strings.SplitN(string(n), ":", 2)

+	return len(parts) > 1 && parts[0] == "container"

+}

+

+// Valid indicates whether the ipc stack is valid.

+func (n IpcMode) Valid() bool {

+	parts := strings.Split(string(n), ":")

+	switch mode := parts[0]; mode {

+	case "", "host":

+	case "container":

+		if len(parts) != 2 || parts[1] == "" {

+			return false

+		}

+	default:

+		return false

+	}

+	return true

+}

+

+// Container returns the name of the container ipc stack is going to be used.

+func (n IpcMode) Container() string {

+	parts := strings.SplitN(string(n), ":", 2)

+	if len(parts) > 1 {

+		return parts[1]

+	}

+	return ""

+}

+

+// UTSMode represents the UTS namespace of the container.

+type UTSMode string

+

+// IsPrivate indicates whether the container uses it's private UTS namespace.

+func (n UTSMode) IsPrivate() bool {

+	return !(n.IsHost())

+}

+

+// IsHost indicates whether the container uses the host's UTS namespace.

+func (n UTSMode) IsHost() bool {

+	return n == "host"

+}

+

+// Valid indicates whether the UTS namespace is valid.

+func (n UTSMode) Valid() bool {

+	parts := strings.Split(string(n), ":")

+	switch mode := parts[0]; mode {

+	case "", "host":

+	default:

+		return false

+	}

+	return true

+}

+

+// PidMode represents the pid stack of the container.

+type PidMode string

+

+// IsPrivate indicates whether the container uses it's private pid stack.

+func (n PidMode) IsPrivate() bool {

+	return !(n.IsHost())

+}

+

+// IsHost indicates whether the container uses the host's pid stack.

+func (n PidMode) IsHost() bool {

+	return n == "host"

+}

+

+// Valid indicates whether the pid stack is valid.

+func (n PidMode) Valid() bool {

+	parts := strings.Split(string(n), ":")

+	switch mode := parts[0]; mode {

+	case "", "host":

+	default:

+		return false

+	}

+	return true

+}

+

+// DeviceMapping represents the device mapping between the host and the container.

+type DeviceMapping struct {

+	PathOnHost        string

+	PathInContainer   string

+	CgroupPermissions string

+}

+

+// RestartPolicy represents the restart policies of the container.

+type RestartPolicy struct {

+	Name              string

+	MaximumRetryCount int

+}

+

+// IsNone indicates whether the container has the "no" restart policy.

+// This means the container will not automatically restart when exiting.

+func (rp *RestartPolicy) IsNone() bool {

+	return rp.Name == "no"

+}

+

+// IsAlways indicates whether the container has the "always" restart policy.

+// This means the container will automatically restart regardless of the exit status.

+func (rp *RestartPolicy) IsAlways() bool {

+	return rp.Name == "always"

+}

+

+// IsOnFailure indicates whether the container has the "on-failure" restart policy.

+// This means the contain will automatically restart of exiting with a non-zero exit status.

+func (rp *RestartPolicy) IsOnFailure() bool {

+	return rp.Name == "on-failure"

+}

+

+// IsUnlessStopped indicates whether the container has the

+// "unless-stopped" restart policy. This means the container will

+// automatically restart unless user has put it to stopped state.

+func (rp *RestartPolicy) IsUnlessStopped() bool {

+	return rp.Name == "unless-stopped"

+}

+

+// LogConfig represents the logging configuration of the container.

+type LogConfig struct {

+	Type   string

+	Config map[string]string

+}

+

+// Resources contains container's resources (cgroups config, ulimits...)

+type Resources struct {

+	// Applicable to all platforms

+	CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)

+

+	// Applicable to UNIX platforms

+	CgroupParent         string // Parent cgroup.

+	BlkioWeight          uint16 // Block IO weight (relative weight vs. other containers)

+	BlkioWeightDevice    []*blkiodev.WeightDevice

+	BlkioDeviceReadBps   []*blkiodev.ThrottleDevice

+	BlkioDeviceWriteBps  []*blkiodev.ThrottleDevice

+	BlkioDeviceReadIOps  []*blkiodev.ThrottleDevice

+	BlkioDeviceWriteIOps []*blkiodev.ThrottleDevice

+	CPUPeriod            int64            `json:"CpuPeriod"` // CPU CFS (Completely Fair Scheduler) period

+	CPUQuota             int64            `json:"CpuQuota"`  // CPU CFS (Completely Fair Scheduler) quota

+	CpusetCpus           string           // CpusetCpus 0-2, 0,1

+	CpusetMems           string           // CpusetMems 0-2, 0,1

+	Devices              []DeviceMapping  // List of devices to map inside the container

+	KernelMemory         int64            // Kernel memory limit (in bytes)

+	Memory               int64            // Memory limit (in bytes)

+	MemoryReservation    int64            // Memory soft limit (in bytes)

+	MemorySwap           int64            // Total memory usage (memory + swap); set `-1` to disable swap

+	MemorySwappiness     *int64           // Tuning container memory swappiness behaviour

+	OomKillDisable       bool             // Whether to disable OOM Killer or not

+	Ulimits              []*ulimit.Ulimit // List of ulimits to be set in the container

+}

+

+// HostConfig the non-portable Config structure of a container.

+// Here, "non-portable" means "dependent of the host we are running on".

+// Portable information *should* appear in Config.

+type HostConfig struct {

+	// Applicable to all platforms

+	Binds           []string      // List of volume bindings for this container

+	ContainerIDFile string        // File (path) where the containerId is written

+	LogConfig       LogConfig     // Configuration of the logs for this container

+	NetworkMode     NetworkMode   // Network mode to use for the container

+	PortBindings    nat.PortMap   // Port mapping between the exposed port (container) and the host

+	RestartPolicy   RestartPolicy // Restart policy to be used for the container

+	VolumeDriver    string        // Name of the volume driver used to mount volumes

+	VolumesFrom     []string      // List of volumes to take from other container

+

+	// Applicable to UNIX platforms

+	CapAdd          *strslice.StrSlice // List of kernel capabilities to add to the container

+	CapDrop         *strslice.StrSlice // List of kernel capabilities to remove from the container

+	DNS             []string           `json:"Dns"`        // List of DNS server to lookup

+	DNSOptions      []string           `json:"DnsOptions"` // List of DNSOption to look for

+	DNSSearch       []string           `json:"DnsSearch"`  // List of DNSSearch to look for

+	ExtraHosts      []string           // List of extra hosts

+	GroupAdd        []string           // List of additional groups that the container process will run as

+	IpcMode         IpcMode            // IPC namespace to use for the container

+	Links           []string           // List of links (in the name:alias form)

+	OomScoreAdj     int                // Container preference for OOM-killing

+	OomKillDisable  bool               // Whether to disable OOM Killer or not

+	PidMode         PidMode            // PID namespace to use for the container

+	Privileged      bool               // Is the container in privileged mode

+	PublishAllPorts bool               // Should docker publish all exposed port for the container

+	ReadonlyRootfs  bool               // Is the container root filesystem in read-only

+	SecurityOpt     []string           // List of string values to customize labels for MLS systems, such as SELinux.

+	Tmpfs           map[string]string  `json:",omitempty"` // List of tmpfs (mounts) used for the container

+	UTSMode         UTSMode            // UTS namespace to use for the container

+	ShmSize         *int64             // Total shm memory usage

+

+	// Applicable to Windows

+	ConsoleSize [2]int         // Initial console size

+	Isolation   IsolationLevel // Isolation level of the container (eg default, hyperv)

+

+	// Contains container's resources (cgroups, ulimits)

+	Resources

+}

new file mode 100644

@@ -0,0 +1,87 @@

+// +build !windows

+

+package container

+

+import "strings"

+

+// IsValid indicates is an isolation level is valid

+func (i IsolationLevel) IsValid() bool {

+	return i.IsDefault()

+}

+

+// IsPrivate indicates whether container uses it's private network stack.

+func (n NetworkMode) IsPrivate() bool {

+	return !(n.IsHost() || n.IsContainer())

+}

+

+// IsDefault indicates whether container uses the default network stack.

+func (n NetworkMode) IsDefault() bool {

+	return n == "default"

+}

+

+// NetworkName returns the name of the network stack.

+func (n NetworkMode) NetworkName() string {

+	if n.IsBridge() {

+		return "bridge"

+	} else if n.IsHost() {

+		return "host"

+	} else if n.IsContainer() {

+		return "container"

+	} else if n.IsNone() {

+		return "none"

+	} else if n.IsDefault() {

+		return "default"

+	} else if n.IsUserDefined() {

+		return n.UserDefined()

+	}

+	return ""

+}

+

+// IsBridge indicates whether container uses the bridge network stack

+func (n NetworkMode) IsBridge() bool {

+	return n == "bridge"

+}

+

+// IsHost indicates whether container uses the host network stack.

+func (n NetworkMode) IsHost() bool {

+	return n == "host"

+}

+

+// IsContainer indicates whether container uses a container network stack.

+func (n NetworkMode) IsContainer() bool {

+	parts := strings.SplitN(string(n), ":", 2)

+	return len(parts) > 1 && parts[0] == "container"

+}

+

+// IsNone indicates whether container isn't using a network stack.

+func (n NetworkMode) IsNone() bool {

+	return n == "none"

+}

+

+// ConnectedContainer is the id of the container which network this container is connected to.

+func (n NetworkMode) ConnectedContainer() string {

+	parts := strings.SplitN(string(n), ":", 2)

+	if len(parts) > 1 {

+		return parts[1]

+	}

+	return ""

+}

+

+// IsUserDefined indicates user-created network

+func (n NetworkMode) IsUserDefined() bool {

+	return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer()

+}

+

+// IsPreDefinedNetwork indicates if a network is predefined by the daemon

+func IsPreDefinedNetwork(network string) bool {

+	n := NetworkMode(network)

+	return n.IsBridge() || n.IsHost() || n.IsNone()

+}

+

+//UserDefined indicates user-created network

+func (n NetworkMode) UserDefined() string {

+	if n.IsUserDefined() {

+		return string(n)

+	}

+	return ""

+}

new file mode 100644

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

+package container

+

+import (

+	"fmt"

+	"strings"

+)

+

+// IsDefault indicates whether container uses the default network stack.

+func (n NetworkMode) IsDefault() bool {

+	return n == "default"

+}

+

+// IsHyperV indicates the use of a Hyper-V partition for isolation

+func (i IsolationLevel) IsHyperV() bool {

+	return strings.ToLower(string(i)) == "hyperv"

+}

+

+// IsProcess indicates the use of process isolation

+func (i IsolationLevel) IsProcess() bool {

+	return strings.ToLower(string(i)) == "process"

+}

+

+// IsValid indicates is an isolation level is valid

+func (i IsolationLevel) IsValid() bool {

+	return i.IsDefault() || i.IsHyperV() || i.IsProcess()

+}

+

+// DefaultDaemonNetworkMode returns the default network stack the daemon should

+// use.

+func DefaultDaemonNetworkMode() NetworkMode {

+	return NetworkMode("default")

+}

+

+// NetworkName returns the name of the network stack.

+func (n NetworkMode) NetworkName() string {

+	if n.IsDefault() {

+		return "default"

+	}

+	return ""

+}

+

+// IsPreDefinedNetwork indicates if a network is predefined by the daemon

+func IsPreDefinedNetwork(network string) bool {

+	return false

+}

+

+// ValidateNetMode ensures that the various combinations of requested

+// network settings are valid.

+func ValidateNetMode(c *Config, hc *HostConfig) error {

+	// We may not be passed a host config, such as in the case of docker commit

+	if hc == nil {

+		return nil

+	}

+	parts := strings.Split(string(hc.NetworkMode), ":")

+	switch mode := parts[0]; mode {

+	case "default", "none":

+	default:

+		return fmt.Errorf("invalid --net: %s", hc.NetworkMode)

+	}

+	return nil

+}

+

+// ValidateIsolationLevel performs platform specific validation of the

+// isolation level in the hostconfig structure. Windows supports 'default' (or

+// blank), 'process', or 'hyperv'.

+func ValidateIsolationLevel(hc *HostConfig) error {

+	// We may not be passed a host config, such as in the case of docker commit

+	if hc == nil {

+		return nil

+	}

+	if !hc.Isolation.IsValid() {

+		return fmt.Errorf("invalid --isolation: %q. Windows supports 'default', 'process', or 'hyperv'", hc.Isolation)

+	}

+	return nil

+}

@@ -4,10 +4,10 @@ import (

 	"os"

 	"time"

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

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

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

 	"github.com/docker/docker/pkg/version"

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

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

 )

@@ -103,10 +103,10 @@ type ImageInspect struct {

 	Comment         string

 	Created         string

 	Container       string

-	ContainerConfig *runconfig.Config

+	ContainerConfig *container.Config

 	DockerVersion   string

 	Author          string

-	Config          *runconfig.Config

+	Config          *container.Config

 	Architecture    string

 	Os              string

 	Size            int64

@@ -283,7 +283,7 @@ type ContainerJSONBase struct {

 	ProcessLabel    string

 	AppArmorProfile string

 	ExecIDs         []string

-	HostConfig      *runconfig.HostConfig

+	HostConfig      *container.HostConfig

 	GraphDriver     GraphDriverData

 	SizeRw          *int64 `json:",omitempty"`

 	SizeRootFs      *int64 `json:",omitempty"`

@@ -293,7 +293,7 @@ type ContainerJSONBase struct {

 type ContainerJSON struct {

 	*ContainerJSONBase

 	Mounts          []MountPoint

-	Config          *runconfig.Config

+	Config          *container.Config

 	NetworkSettings *NetworkSettings

 }

@@ -3,8 +3,8 @@ package v1p19

 import (

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

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

 	"github.com/docker/docker/api/types/versions/v1p20"

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

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

 )

@@ -20,7 +20,7 @@ type ContainerJSON struct {

 // ContainerConfig is a backcompatibility struct for APIs prior to 1.20.

 type ContainerConfig struct {

-	*runconfig.Config

+	*container.Config

 	MacAddress      string

 	NetworkDisabled bool

@@ -3,7 +3,7 @@ package v1p20

 import (

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

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

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

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

 )

@@ -17,7 +17,7 @@ type ContainerJSON struct {

 // ContainerConfig is a backcompatibility struct used in ContainerJSON for the API 1.20

 type ContainerConfig struct {

-	*runconfig.Config

+	*container.Config

 	MacAddress      string

 	NetworkDisabled bool

@@ -10,7 +10,7 @@ import (

 	"time"

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

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

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

 )

 // Context represents a file system tree.

@@ -113,7 +113,7 @@ type Backend interface {

 	// Kill stops the container execution abruptly.

 	ContainerKill(containerID string, sig uint64) error

 	// Start starts a new container

-	ContainerStart(containerID string, hostConfig *runconfig.HostConfig) error

+	ContainerStart(containerID string, hostConfig *container.HostConfig) error

 	// ContainerWait stops processing until the given container is stopped.

 	ContainerWait(containerID string, timeout time.Duration) (int, error)

@@ -135,5 +135,5 @@ type Backend interface {

 type ImageCache interface {

 	// GetCachedImage returns a reference to a cached image whose parent equals `parent`

 	// and runconfig equals `cfg`. A cache miss is expected to return an empty ID and a nil error.

-	GetCachedImage(parentID string, cfg *runconfig.Config) (imageID string, err error)

+	GetCachedImage(parentID string, cfg *container.Config) (imageID string, err error)

 }

@@ -10,11 +10,11 @@ import (

 	"sync"

 	"github.com/Sirupsen/logrus"

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

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/parser"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/ulimit"

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

 )

 var validCommitCommands = map[string]bool{

@@ -52,7 +52,7 @@ type Config struct {

 	ForceRemove bool

 	Pull        bool

 	BuildArgs   map[string]string // build-time args received in build context for expansion/substitution and commands in 'run'.

-	Isolation   runconfig.IsolationLevel

+	Isolation   container.IsolationLevel

 	// resource constraints

 	// TODO: factor out to be reused with Run ?

@@ -81,7 +81,7 @@ type Builder struct {

 	context builder.Context