kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove runtime options from config

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-03 04:40:38 +00:00
parent 36af2936af
commit e2779e11db
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
runconfig/config.go
View file

@ -1,10 +1,8 @@
package runconfig package runconfig
import ( import (
"encoding/json"
"github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/nat" "github.com/dotcloud/docker/nat"
"github.com/dotcloud/docker/runtime/execdriver"
) )
// Note: the Config structure should hold only portable information about the container. // Note: the Config structure should hold only portable information about the container.
@ -36,17 +34,9 @@ type Config struct {
Entrypoint []string Entrypoint []string
NetworkDisabled bool NetworkDisabled bool
OnBuild []string OnBuild []string
Context execdriver.Context
} }
func ContainerConfigFromJob(job *engine.Job) *Config { func ContainerConfigFromJob(job *engine.Job) *Config {
var context execdriver.Context
val := job.Getenv("Context")
if val != "" {
if err := json.Unmarshal([]byte(val), &context); err != nil {
panic(err)
}
}
config := &Config{ config := &Config{
Hostname: job.Getenv("Hostname"), Hostname: job.Getenv("Hostname"),
Domainname: job.Getenv("Domainname"), Domainname: job.Getenv("Domainname"),
@ -64,7 +54,6 @@ func ContainerConfigFromJob(job *engine.Job) *Config {
VolumesFrom: job.Getenv("VolumesFrom"), VolumesFrom: job.Getenv("VolumesFrom"),
WorkingDir: job.Getenv("WorkingDir"), WorkingDir: job.Getenv("WorkingDir"),
NetworkDisabled: job.GetenvBool("NetworkDisabled"), NetworkDisabled: job.GetenvBool("NetworkDisabled"),
Context: context,
} }
job.GetenvJson("ExposedPorts", &config.ExposedPorts) job.GetenvJson("ExposedPorts", &config.ExposedPorts)
job.GetenvJson("Volumes", &config.Volumes) job.GetenvJson("Volumes", &config.Volumes)
@ -86,6 +75,5 @@ func ContainerConfigFromJob(job *engine.Job) *Config {
if Entrypoint := job.GetenvList("Entrypoint"); Entrypoint != nil { if Entrypoint := job.GetenvList("Entrypoint"); Entrypoint != nil {
config.Entrypoint = Entrypoint config.Entrypoint = Entrypoint
} }
return config return config
} }

4
runtime/runtime.go
View file

@ -499,7 +499,7 @@ func (runtime *Runtime) Create(config *runconfig.Config, name string) (*Containe
} }
initID := fmt.Sprintf("%s-init", container.ID) initID := fmt.Sprintf("%s-init", container.ID)
if err := runtime.driver.Create(initID, img.ID, config.Context["mount_label"]); err != nil { if err := runtime.driver.Create(initID, img.ID, ""); err != nil {
return nil, nil, err return nil, nil, err
} }
initPath, err := runtime.driver.Get(initID) initPath, err := runtime.driver.Get(initID)
@ -512,7 +512,7 @@ func (runtime *Runtime) Create(config *runconfig.Config, name string) (*Containe
return nil, nil, err return nil, nil, err
} }
if err := runtime.driver.Create(container.ID, initID, config.Context["mount_label"]); err != nil { if err := runtime.driver.Create(container.ID, initID, ""); err != nil {
return nil, nil, err return nil, nil, err
} }
resolvConf, err := utils.GetResolvConf() resolvConf, err := utils.GetResolvConf()