Merge pull request moby#4 from crosbymichael/move-config-opts

Move Dns and VolumesFrom to host config
proppy · Apr 25, 2014 · f3649e5 · f3649e5
2 parents ce1770c + 15facf1
commit f3649e5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/types.go b/types.go
@@ -15,9 +15,7 @@ type ContainerConfig struct {
 	StdinOnce       bool
 	Env             []string
 	Cmd             []string
-	Dns             []string
 	Image           string
-	VolumesFrom     string
 	WorkingDir      string
 	Entrypoint      []string
 	NetworkDisabled bool
@@ -31,6 +29,9 @@ type HostConfig struct {
 	PortBindings    map[string][]PortBinding
 	Links           []string
 	PublishAllPorts bool
+	Dns             []string
+	DnsSearch       []string
+	VolumesFrom     []string
 }
 
 type PortBinding struct {