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

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/auth"

 	"github.com/dotcloud/docker/registry"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

@@ -38,7 +39,7 @@ type buildFile struct {

 	image      string

 	maintainer string

-	config     *Config

+	config     *runconfig.Config

 	contextPath string

 	context     *utils.TarSum

@@ -101,7 +102,7 @@ func (b *buildFile) CmdFrom(name string) error {

 		}

 	}

 	b.image = image.ID

-	b.config = &Config{}

+	b.config = &runconfig.Config{}

 	if image.Config != nil {

 		b.config = image.Config

 	}

@@ -158,14 +159,14 @@ func (b *buildFile) CmdRun(args string) error {

 	if b.image == "" {

 		return fmt.Errorf("Please provide a source image with `from` prior to run")

 	}

-	config, _, _, err := ParseRun(append([]string{b.image}, b.buildCmdFromJson(args)...), nil)

+	config, _, _, err := runconfig.Parse(append([]string{b.image}, b.buildCmdFromJson(args)...), nil)

 	if err != nil {

 		return err

 	}

 	cmd := b.config.Cmd

 	b.config.Cmd = nil

-	MergeConfig(b.config, config)

+	runconfig.Merge(b.config, config)

 	defer func(cmd []string) { b.config.Cmd = cmd }(cmd)

@@ -742,7 +743,7 @@ func NewBuildFile(srv *Server, outStream, errStream io.Writer, verbose, utilizeC

 	return &buildFile{

 		runtime:       srv.runtime,

 		srv:           srv,

-		config:        &Config{},

+		config:        &runconfig.Config{},

 		outStream:     outStream,

 		errStream:     errStream,

 		tmpContainers: make(map[string]struct{}),

@@ -15,10 +15,9 @@ import (

 	"github.com/dotcloud/docker/engine"

 	"github.com/dotcloud/docker/nat"

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

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

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

 	"github.com/dotcloud/docker/pkg/term"

 	"github.com/dotcloud/docker/registry"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

@@ -1449,11 +1448,11 @@ func (cli *DockerCli) CmdCommit(args ...string) error {

 	v.Set("comment", *flComment)

 	v.Set("author", *flAuthor)

 	var (

-		config *Config

+		config *runconfig.Config

 		env    engine.Env

 	)

 	if *flConfig != "" {

-		config = &Config{}

+		config = &runconfig.Config{}

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

 			return err

 		}

@@ -1743,210 +1742,9 @@ func (cli *DockerCli) CmdTag(args ...string) error {

 	return nil

 }

-//FIXME Only used in tests

-func ParseRun(args []string, sysInfo *sysinfo.SysInfo) (*Config, *HostConfig, *flag.FlagSet, error) {

-	cmd := flag.NewFlagSet("run", flag.ContinueOnError)

-	cmd.SetOutput(ioutil.Discard)

-	cmd.Usage = nil

-	return parseRun(cmd, args, sysInfo)

-}

-

-func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Config, *HostConfig, *flag.FlagSet, error) {

-	var (

-		// FIXME: use utils.ListOpts for attach and volumes?

-		flAttach  = opts.NewListOpts(opts.ValidateAttach)

-		flVolumes = opts.NewListOpts(opts.ValidatePath)

-		flLinks   = opts.NewListOpts(opts.ValidateLink)

-		flEnv     = opts.NewListOpts(opts.ValidateEnv)

-

-		flPublish     opts.ListOpts

-		flExpose      opts.ListOpts

-		flDns         opts.ListOpts

-		flVolumesFrom opts.ListOpts

-		flLxcOpts     opts.ListOpts

-

-		flAutoRemove      = cmd.Bool([]string{"#rm", "-rm"}, false, "Automatically remove the container when it exits (incompatible with -d)")

-		flDetach          = cmd.Bool([]string{"d", "-detach"}, false, "Detached mode: Run container in the background, print new container id")

-		flNetwork         = cmd.Bool([]string{"n", "-networking"}, true, "Enable networking for this container")

-		flPrivileged      = cmd.Bool([]string{"#privileged", "-privileged"}, false, "Give extended privileges to this container")

-		flPublishAll      = cmd.Bool([]string{"P", "-publish-all"}, false, "Publish all exposed ports to the host interfaces")

-		flStdin           = cmd.Bool([]string{"i", "-interactive"}, false, "Keep stdin open even if not attached")

-		flTty             = cmd.Bool([]string{"t", "-tty"}, false, "Allocate a pseudo-tty")

-		flContainerIDFile = cmd.String([]string{"#cidfile", "-cidfile"}, "", "Write the container ID to the file")

-		flEntrypoint      = cmd.String([]string{"#entrypoint", "-entrypoint"}, "", "Overwrite the default entrypoint of the image")

-		flHostname        = cmd.String([]string{"h", "-hostname"}, "", "Container host name")

-		flMemoryString    = cmd.String([]string{"m", "-memory"}, "", "Memory limit (format: <number><optional unit>, where unit = b, k, m or g)")

-		flUser            = cmd.String([]string{"u", "-user"}, "", "Username or UID")

-		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")

-		flCpuShares       = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")

-

-		// For documentation purpose

-		_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")

-		_ = cmd.String([]string{"#name", "-name"}, "", "Assign a name to the container")

-	)

-

-	cmd.Var(&flAttach, []string{"a", "-attach"}, "Attach to stdin, stdout or stderr.")

-	cmd.Var(&flVolumes, []string{"v", "-volume"}, "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")

-	cmd.Var(&flLinks, []string{"#link", "-link"}, "Add link to another container (name:alias)")

-	cmd.Var(&flEnv, []string{"e", "-env"}, "Set environment variables")

-

-	cmd.Var(&flPublish, []string{"p", "-publish"}, fmt.Sprintf("Publish a container's port to the host (format: %s) (use 'docker port' to see the actual mapping)", nat.PortSpecTemplateFormat))

-	cmd.Var(&flExpose, []string{"#expose", "-expose"}, "Expose a port from the container without publishing it to your host")

-	cmd.Var(&flDns, []string{"#dns", "-dns"}, "Set custom dns servers")

-	cmd.Var(&flVolumesFrom, []string{"#volumes-from", "-volumes-from"}, "Mount volumes from the specified container(s)")

-	cmd.Var(&flLxcOpts, []string{"#lxc-conf", "-lxc-conf"}, "Add custom lxc options -lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")

-

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

-		return nil, nil, cmd, err

-	}

-

-	// Check if the kernel supports memory limit cgroup.

-	if sysInfo != nil && *flMemoryString != "" && !sysInfo.MemoryLimit {

-		*flMemoryString = ""

-	}

-

-	// Validate input params

-	if *flDetach && flAttach.Len() > 0 {

-		return nil, nil, cmd, ErrConflictAttachDetach

-	}

-	if *flWorkingDir != "" && !path.IsAbs(*flWorkingDir) {

-		return nil, nil, cmd, ErrInvalidWorikingDirectory

-	}

-	if *flDetach && *flAutoRemove {

-		return nil, nil, cmd, ErrConflictDetachAutoRemove

-	}

-

-	// If neither -d or -a are set, attach to everything by default

-	if flAttach.Len() == 0 && !*flDetach {

-		if !*flDetach {

-			flAttach.Set("stdout")

-			flAttach.Set("stderr")

-			if *flStdin {

-				flAttach.Set("stdin")

-			}

-		}

-	}

-

-	var flMemory int64

-	if *flMemoryString != "" {

-		parsedMemory, err := utils.RAMInBytes(*flMemoryString)

-		if err != nil {

-			return nil, nil, cmd, err

-		}

-		flMemory = parsedMemory

-	}

-

-	var binds []string

-	// add any bind targets to the list of container volumes

-	for bind := range flVolumes.GetMap() {

-		if arr := strings.Split(bind, ":"); len(arr) > 1 {

-			if arr[0] == "/" {

-				return nil, nil, cmd, fmt.Errorf("Invalid bind mount: source can't be '/'")

-			}

-			dstDir := arr[1]

-			flVolumes.Set(dstDir)

-			binds = append(binds, bind)

-			flVolumes.Delete(bind)

-		} else if bind == "/" {

-			return nil, nil, cmd, fmt.Errorf("Invalid volume: path can't be '/'")

-		}

-	}

-

-	var (

-		parsedArgs = cmd.Args()

-		runCmd     []string

-		entrypoint []string

-		image      string

-	)

-	if len(parsedArgs) >= 1 {

-		image = cmd.Arg(0)

-	}

-	if len(parsedArgs) > 1 {

-		runCmd = parsedArgs[1:]

-	}

-	if *flEntrypoint != "" {

-		entrypoint = []string{*flEntrypoint}

-	}

-

-	lxcConf, err := parseLxcConfOpts(flLxcOpts)

-	if err != nil {

-		return nil, nil, cmd, err

-	}

-

-	var (

-		domainname string

-		hostname   = *flHostname

-		parts      = strings.SplitN(hostname, ".", 2)

-	)

-	if len(parts) > 1 {

-		hostname = parts[0]

-		domainname = parts[1]

-	}

-

-	ports, portBindings, err := nat.ParsePortSpecs(flPublish.GetAll())

-	if err != nil {

-		return nil, nil, cmd, err

-	}

-

-	// Merge in exposed ports to the map of published ports

-	for _, e := range flExpose.GetAll() {

-		if strings.Contains(e, ":") {

-			return nil, nil, cmd, fmt.Errorf("Invalid port format for --expose: %s", e)

-		}

-		p := nat.NewPort(nat.SplitProtoPort(e))

-		if _, exists := ports[p]; !exists {

-			ports[p] = struct{}{}

-		}

-	}

-

-	config := &Config{

-		Hostname:        hostname,

-		Domainname:      domainname,

-		PortSpecs:       nil, // Deprecated

-		ExposedPorts:    ports,

-		User:            *flUser,

-		Tty:             *flTty,

-		NetworkDisabled: !*flNetwork,

-		OpenStdin:       *flStdin,

-		Memory:          flMemory,

-		CpuShares:       *flCpuShares,

-		AttachStdin:     flAttach.Get("stdin"),

-		AttachStdout:    flAttach.Get("stdout"),

-		AttachStderr:    flAttach.Get("stderr"),

-		Env:             flEnv.GetAll(),

-		Cmd:             runCmd,

-		Dns:             flDns.GetAll(),

-		Image:           image,

-		Volumes:         flVolumes.GetMap(),

-		VolumesFrom:     strings.Join(flVolumesFrom.GetAll(), ","),

-		Entrypoint:      entrypoint,

-		WorkingDir:      *flWorkingDir,

-	}

-

-	hostConfig := &HostConfig{

-		Binds:           binds,

-		ContainerIDFile: *flContainerIDFile,

-		LxcConf:         lxcConf,

-		Privileged:      *flPrivileged,

-		PortBindings:    portBindings,

-		Links:           flLinks.GetAll(),

-		PublishAllPorts: *flPublishAll,

-	}

-

-	if sysInfo != nil && flMemory > 0 && !sysInfo.SwapLimit {

-		//fmt.Fprintf(stdout, "WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.\n")

-		config.MemorySwap = -1

-	}

-

-	// When allocating stdin in attached mode, close stdin at client disconnect

-	if config.OpenStdin && config.AttachStdin {

-		config.StdinOnce = true

-	}

-	return config, hostConfig, cmd, nil

-}

-

 func (cli *DockerCli) CmdRun(args ...string) error {

-	config, hostConfig, cmd, err := parseRun(cli.Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container"), args, nil)

+	// FIXME: just use runconfig.Parse already

+	config, hostConfig, cmd, err := runconfig.ParseSubcommand(cli.Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container"), args, nil)

 	if err != nil {

 		return err

 	}

@@ -1,16 +1,17 @@

 package docker

 import (

+	"github.com/dotcloud/docker/runconfig"

 	"strings"

 	"testing"

 )

-func parse(t *testing.T, args string) (*Config, *HostConfig, error) {

-	config, hostConfig, _, err := ParseRun(strings.Split(args+" ubuntu bash", " "), nil)

+func parse(t *testing.T, args string) (*runconfig.Config, *runconfig.HostConfig, error) {

+	config, hostConfig, _, err := runconfig.Parse(strings.Split(args+" ubuntu bash", " "), nil)

 	return config, hostConfig, err

 }

-func mustParse(t *testing.T, args string) (*Config, *HostConfig) {

+func mustParse(t *testing.T, args string) (*runconfig.Config, *runconfig.HostConfig) {

 	config, hostConfig, err := parse(t, args)

 	if err != nil {

 		t.Fatal(err)

deleted file mode 100644

@@ -1,150 +0,0 @@

-package docker

-

-import (

-	"github.com/dotcloud/docker/nat"

-	"testing"

-)

-

-func TestCompareConfig(t *testing.T) {

-	volumes1 := make(map[string]struct{})

-	volumes1["/test1"] = struct{}{}

-	config1 := Config{

-		Dns:         []string{"1.1.1.1", "2.2.2.2"},

-		PortSpecs:   []string{"1111:1111", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "11111111",

-		Volumes:     volumes1,

-	}

-	config2 := Config{

-		Dns:         []string{"0.0.0.0", "2.2.2.2"},

-		PortSpecs:   []string{"1111:1111", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "11111111",

-		Volumes:     volumes1,

-	}

-	config3 := Config{

-		Dns:         []string{"1.1.1.1", "2.2.2.2"},

-		PortSpecs:   []string{"0000:0000", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "11111111",

-		Volumes:     volumes1,

-	}

-	config4 := Config{

-		Dns:         []string{"1.1.1.1", "2.2.2.2"},

-		PortSpecs:   []string{"0000:0000", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "22222222",

-		Volumes:     volumes1,

-	}

-	volumes2 := make(map[string]struct{})

-	volumes2["/test2"] = struct{}{}

-	config5 := Config{

-		Dns:         []string{"1.1.1.1", "2.2.2.2"},

-		PortSpecs:   []string{"0000:0000", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "11111111",

-		Volumes:     volumes2,

-	}

-	if CompareConfig(&config1, &config2) {

-		t.Fatalf("CompareConfig should return false, Dns are different")

-	}

-	if CompareConfig(&config1, &config3) {

-		t.Fatalf("CompareConfig should return false, PortSpecs are different")

-	}

-	if CompareConfig(&config1, &config4) {

-		t.Fatalf("CompareConfig should return false, VolumesFrom are different")

-	}

-	if CompareConfig(&config1, &config5) {

-		t.Fatalf("CompareConfig should return false, Volumes are different")

-	}

-	if !CompareConfig(&config1, &config1) {

-		t.Fatalf("CompareConfig should return true")

-	}

-}

-

-func TestMergeConfig(t *testing.T) {

-	volumesImage := make(map[string]struct{})

-	volumesImage["/test1"] = struct{}{}

-	volumesImage["/test2"] = struct{}{}

-	configImage := &Config{

-		Dns:         []string{"1.1.1.1", "2.2.2.2"},

-		PortSpecs:   []string{"1111:1111", "2222:2222"},

-		Env:         []string{"VAR1=1", "VAR2=2"},

-		VolumesFrom: "1111",

-		Volumes:     volumesImage,

-	}

-

-	volumesUser := make(map[string]struct{})

-	volumesUser["/test3"] = struct{}{}

-	configUser := &Config{

-		Dns:       []string{"3.3.3.3"},

-		PortSpecs: []string{"3333:2222", "3333:3333"},

-		Env:       []string{"VAR2=3", "VAR3=3"},

-		Volumes:   volumesUser,

-	}

-

-	if err := MergeConfig(configUser, configImage); err != nil {

-		t.Error(err)

-	}

-

-	if len(configUser.Dns) != 3 {

-		t.Fatalf("Expected 3 dns, 1.1.1.1, 2.2.2.2 and 3.3.3.3, found %d", len(configUser.Dns))

-	}

-	for _, dns := range configUser.Dns {

-		if dns != "1.1.1.1" && dns != "2.2.2.2" && dns != "3.3.3.3" {

-			t.Fatalf("Expected 1.1.1.1 or 2.2.2.2 or 3.3.3.3, found %s", dns)

-		}

-	}

-

-	if len(configUser.ExposedPorts) != 3 {

-		t.Fatalf("Expected 3 ExposedPorts, 1111, 2222 and 3333, found %d", len(configUser.ExposedPorts))

-	}

-	for portSpecs := range configUser.ExposedPorts {

-		if portSpecs.Port() != "1111" && portSpecs.Port() != "2222" && portSpecs.Port() != "3333" {

-			t.Fatalf("Expected 1111 or 2222 or 3333, found %s", portSpecs)

-		}

-	}

-	if len(configUser.Env) != 3 {

-		t.Fatalf("Expected 3 env var, VAR1=1, VAR2=3 and VAR3=3, found %d", len(configUser.Env))

-	}

-	for _, env := range configUser.Env {

-		if env != "VAR1=1" && env != "VAR2=3" && env != "VAR3=3" {

-			t.Fatalf("Expected VAR1=1 or VAR2=3 or VAR3=3, found %s", env)

-		}

-	}

-

-	if len(configUser.Volumes) != 3 {

-		t.Fatalf("Expected 3 volumes, /test1, /test2 and /test3, found %d", len(configUser.Volumes))

-	}

-	for v := range configUser.Volumes {

-		if v != "/test1" && v != "/test2" && v != "/test3" {

-			t.Fatalf("Expected /test1 or /test2 or /test3, found %s", v)

-		}

-	}

-

-	if configUser.VolumesFrom != "1111" {

-		t.Fatalf("Expected VolumesFrom to be 1111, found %s", configUser.VolumesFrom)

-	}

-

-	ports, _, err := nat.ParsePortSpecs([]string{"0000"})

-	if err != nil {

-		t.Error(err)

-	}

-	configImage2 := &Config{

-		ExposedPorts: ports,

-	}

-

-	if err := MergeConfig(configUser, configImage2); err != nil {

-		t.Error(err)

-	}

-

-	if len(configUser.ExposedPorts) != 4 {

-		t.Fatalf("Expected 4 ExposedPorts, 0000, 1111, 2222 and 3333, found %d", len(configUser.ExposedPorts))

-	}

-	for portSpecs := range configUser.ExposedPorts {

-		if portSpecs.Port() != "0000" && portSpecs.Port() != "1111" && portSpecs.Port() != "2222" && portSpecs.Port() != "3333" {

-			t.Fatalf("Expected 0000 or 1111 or 2222 or 3333, found %s", portSpecs)

-		}

-	}

-

-}

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

 	"github.com/dotcloud/docker/nat"

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

 	"github.com/dotcloud/docker/pkg/term"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"github.com/kr/pty"

 	"io"

@@ -42,7 +43,7 @@ type Container struct {

 	Path string

 	Args []string

-	Config *Config

+	Config *runconfig.Config

 	State  State

 	Image  string

@@ -68,109 +69,11 @@ type Container struct {

 	// Store rw/ro in a separate structure to preserve reverse-compatibility on-disk.

 	// Easier than migrating older container configs :)

 	VolumesRW  map[string]bool

-	hostConfig *HostConfig

+	hostConfig *runconfig.HostConfig

 	activeLinks map[string]*Link

 }

-// Note: the Config structure 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.

-type Config struct {

-	Hostname        string

-	Domainname      string

-	User            string

-	Memory          int64 // Memory limit (in bytes)

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

-	CpuShares       int64 // CPU shares (relative weight vs. other containers)

-	AttachStdin     bool

-	AttachStdout    bool

-	AttachStderr    bool

-	PortSpecs       []string // Deprecated - Can be in the format of 8080/tcp

-	ExposedPorts    map[nat.Port]struct{}

-	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

-	Cmd             []string

-	Dns             []string

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

-	Volumes         map[string]struct{}

-	VolumesFrom     string

-	WorkingDir      string

-	Entrypoint      []string

-	NetworkDisabled bool

-	OnBuild         []string

-}

-

-func ContainerConfigFromJob(job *engine.Job) *Config {

-	config := &Config{

-		Hostname:        job.Getenv("Hostname"),

-		Domainname:      job.Getenv("Domainname"),

-		User:            job.Getenv("User"),

-		Memory:          job.GetenvInt64("Memory"),

-		MemorySwap:      job.GetenvInt64("MemorySwap"),

-		CpuShares:       job.GetenvInt64("CpuShares"),

-		AttachStdin:     job.GetenvBool("AttachStdin"),

-		AttachStdout:    job.GetenvBool("AttachStdout"),

-		AttachStderr:    job.GetenvBool("AttachStderr"),

-		Tty:             job.GetenvBool("Tty"),

-		OpenStdin:       job.GetenvBool("OpenStdin"),

-		StdinOnce:       job.GetenvBool("StdinOnce"),

-		Image:           job.Getenv("Image"),

-		VolumesFrom:     job.Getenv("VolumesFrom"),

-		WorkingDir:      job.Getenv("WorkingDir"),

-		NetworkDisabled: job.GetenvBool("NetworkDisabled"),

-	}

-	job.GetenvJson("ExposedPorts", &config.ExposedPorts)

-	job.GetenvJson("Volumes", &config.Volumes)

-	if PortSpecs := job.GetenvList("PortSpecs"); PortSpecs != nil {

-		config.PortSpecs = PortSpecs

-	}

-	if Env := job.GetenvList("Env"); Env != nil {

-		config.Env = Env

-	}

-	if Cmd := job.GetenvList("Cmd"); Cmd != nil {

-		config.Cmd = Cmd

-	}

-	if Dns := job.GetenvList("Dns"); Dns != nil {

-		config.Dns = Dns

-	}

-	if Entrypoint := job.GetenvList("Entrypoint"); Entrypoint != nil {

-		config.Entrypoint = Entrypoint

-	}

-

-	return config

-}

-

-type HostConfig struct {

-	Binds           []string

-	ContainerIDFile string

-	LxcConf         []KeyValuePair

-	Privileged      bool

-	PortBindings    nat.PortMap

-	Links           []string

-	PublishAllPorts bool

-}

-

-func ContainerHostConfigFromJob(job *engine.Job) *HostConfig {

-	hostConfig := &HostConfig{

-		ContainerIDFile: job.Getenv("ContainerIDFile"),

-		Privileged:      job.GetenvBool("Privileged"),

-		PublishAllPorts: job.GetenvBool("PublishAllPorts"),

-	}

-	job.GetenvJson("LxcConf", &hostConfig.LxcConf)

-	job.GetenvJson("PortBindings", &hostConfig.PortBindings)

-	if Binds := job.GetenvList("Binds"); Binds != nil {

-		hostConfig.Binds = Binds

-	}

-	if Links := job.GetenvList("Links"); Links != nil {

-		hostConfig.Links = Links

-	}

-

-	return hostConfig

-}

-

 type BindMap struct {

 	SrcPath string

 	DstPath string

@@ -178,18 +81,10 @@ type BindMap struct {

 }

 var (

-	ErrContainerStart           = errors.New("The container failed to start. Unknown error")

-	ErrContainerStartTimeout    = errors.New("The container failed to start due to timed out.")

-	ErrInvalidWorikingDirectory = errors.New("The working directory is invalid. It needs to be an absolute path.")

-	ErrConflictAttachDetach     = errors.New("Conflicting options: -a and -d")

-	ErrConflictDetachAutoRemove = errors.New("Conflicting options: -rm and -d")

+	ErrContainerStart        = errors.New("The container failed to start. Unknown error")

+	ErrContainerStartTimeout = errors.New("The container failed to start due to timed out.")

 )

-type KeyValuePair struct {

-	Key   string

-	Value string

-}

-

 // FIXME: move deprecated port stuff to nat to clean up the core.

 type PortMapping map[string]string // Deprecated

@@ -292,7 +187,7 @@ func (container *Container) ToDisk() (err error) {

 }

 func (container *Container) readHostConfig() error {

-	container.hostConfig = &HostConfig{}

+	container.hostConfig = &runconfig.HostConfig{}

 	// If the hostconfig file does not exist, do not read it.

 	// (We still have to initialize container.hostConfig,

 	// but that's OK, since we just did that above.)

@@ -5,23 +5,6 @@ import (

 	"testing"

 )

-func TestParseLxcConfOpt(t *testing.T) {

-	opts := []string{"lxc.utsname=docker", "lxc.utsname = docker "}

-

-	for _, o := range opts {

-		k, v, err := parseLxcOpt(o)

-		if err != nil {

-			t.FailNow()

-		}

-		if k != "lxc.utsname" {

-			t.Fail()

-		}

-		if v != "docker" {

-			t.Fail()

-		}

-	}

-}

-

 func TestParseNetworkOptsPrivateOnly(t *testing.T) {

 	ports, bindings, err := nat.ParsePortSpecs([]string{"192.168.1.100::80"})

 	if err != nil {

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

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/dockerversion"

 	"github.com/dotcloud/docker/graphdriver"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

@@ -126,7 +127,7 @@ func (graph *Graph) Get(name string) (*Image, error) {

 }

 // Create creates a new image and registers it in the graph.

-func (graph *Graph) Create(layerData archive.Archive, container *Container, comment, author string, config *Config) (*Image, error) {

+func (graph *Graph) Create(layerData archive.Archive, container *Container, comment, author string, config *runconfig.Config) (*Image, error) {

 	img := &Image{

 		ID:            GenerateID(),

 		Comment:       comment,

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

 	"fmt"

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/graphdriver"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"io/ioutil"

@@ -18,17 +19,17 @@ import (

 )

 type Image struct {

-	ID              string    `json:"id"`

-	Parent          string    `json:"parent,omitempty"`

-	Comment         string    `json:"comment,omitempty"`

-	Created         time.Time `json:"created"`

-	Container       string    `json:"container,omitempty"`

-	ContainerConfig Config    `json:"container_config,omitempty"`

-	DockerVersion   string    `json:"docker_version,omitempty"`

-	Author          string    `json:"author,omitempty"`

-	Config          *Config   `json:"config,omitempty"`

-	Architecture    string    `json:"architecture,omitempty"`

-	OS              string    `json:"os,omitempty"`

+	ID              string            `json:"id"`

+	Parent          string            `json:"parent,omitempty"`

+	Comment         string            `json:"comment,omitempty"`

+	Created         time.Time         `json:"created"`

+	Container       string            `json:"container,omitempty"`

+	ContainerConfig runconfig.Config  `json:"container_config,omitempty"`

+	DockerVersion   string            `json:"docker_version,omitempty"`

+	Author          string            `json:"author,omitempty"`

+	Config          *runconfig.Config `json:"config,omitempty"`

+	Architecture    string            `json:"architecture,omitempty"`

+	OS              string            `json:"os,omitempty"`

 	graph           *Graph

 	Size            int64

 }

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

 	"github.com/dotcloud/docker/api"

 	"github.com/dotcloud/docker/dockerversion"

 	"github.com/dotcloud/docker/engine"

+	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

 	"io"

 	"net"

@@ -309,7 +310,7 @@ func TestGetContainersJSON(t *testing.T) {

 	}

 	beginLen := len(outs.Data)

-	containerID := createTestContainer(eng, &docker.Config{

+	containerID := createTestContainer(eng, &runconfig.Config{

 		Image: unitTestImageID,

 		Cmd:   []string{"echo", "test"},

 	}, t)

@@ -346,7 +347,7 @@ func TestGetContainersExport(t *testing.T) {

 	// Create a container and remove a file

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,

 			Cmd:   []string{"touch", "/test"},

 		},

@@ -394,7 +395,7 @@ func TestGetContainersChanges(t *testing.T) {

 	// Create a container and remove a file

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,

 			Cmd:   []string{"/bin/rm", "/etc/passwd"},

 		},

@@ -433,7 +434,7 @@ func TestGetContainersTop(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/sh", "-c", "cat"},

 			OpenStdin: true,

@@ -510,7 +511,7 @@ func TestGetContainersByName(t *testing.T) {

 	// Create a container and remove a file

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,

 			Cmd:   []string{"echo", "test"},

 		},

@@ -542,7 +543,7 @@ func TestPostCommit(t *testing.T) {

 	// Create a container and remove a file

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,

 			Cmd:   []string{"touch", "/test"},

 		},

@@ -578,7 +579,7 @@ func TestPostContainersCreate(t *testing.T) {

 	eng := NewTestEngine(t)

 	defer mkRuntimeFromEngine(eng, t).Nuke()

-	configJSON, err := json.Marshal(&docker.Config{

+	configJSON, err := json.Marshal(&runconfig.Config{

 		Image:  unitTestImageID,

 		Memory: 33554432,

 		Cmd:    []string{"touch", "/test"},

@@ -620,7 +621,7 @@ func TestPostContainersKill(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/cat"},

 			OpenStdin: true,

@@ -659,7 +660,7 @@ func TestPostContainersRestart(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/top"},

 			OpenStdin: true,

@@ -705,7 +706,7 @@ func TestPostContainersStart(t *testing.T) {

 	containerID := createTestContainer(

 		eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/cat"},

 			OpenStdin: true,

@@ -713,7 +714,7 @@ func TestPostContainersStart(t *testing.T) {

 		t,

 	)

-	hostConfigJSON, err := json.Marshal(&docker.HostConfig{})

+	hostConfigJSON, err := json.Marshal(&runconfig.HostConfig{})

 	req, err := http.NewRequest("POST", "/containers/"+containerID+"/start", bytes.NewReader(hostConfigJSON))

 	if err != nil {

@@ -758,7 +759,7 @@ func TestRunErrorBindMountRootSource(t *testing.T) {

 	containerID := createTestContainer(

 		eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/cat"},

 			OpenStdin: true,

@@ -766,7 +767,7 @@ func TestRunErrorBindMountRootSource(t *testing.T) {

 		t,

 	)

-	hostConfigJSON, err := json.Marshal(&docker.HostConfig{

+	hostConfigJSON, err := json.Marshal(&runconfig.HostConfig{

 		Binds: []string{"/:/tmp"},

 	})

@@ -792,7 +793,7 @@ func TestPostContainersStop(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/top"},

 			OpenStdin: true,

@@ -832,7 +833,7 @@ func TestPostContainersWait(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/sleep", "1"},

 			OpenStdin: true,

@@ -870,7 +871,7 @@ func TestPostContainersAttach(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/cat"},

 			OpenStdin: true,

@@ -948,7 +949,7 @@ func TestPostContainersAttachStderr(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image:     unitTestImageID,

 			Cmd:       []string{"/bin/sh", "-c", "/bin/cat >&2"},

 			OpenStdin: true,

@@ -1029,7 +1030,7 @@ func TestDeleteContainers(t *testing.T) {

 	defer mkRuntimeFromEngine(eng, t).Nuke()

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,

 			Cmd:   []string{"touch", "/test"},

 		},

@@ -1164,7 +1165,7 @@ func TestPostContainersCopy(t *testing.T) {

 	// Create a container and remove a file

 	containerID := createTestContainer(eng,

-		&docker.Config{

+		&runconfig.Config{

 			Image: unitTestImageID,