docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3863 from vieux/default_getint_0 

changed default value of getenvint to 0. fix tests
This commit is contained in:
Solomon Hykes 2014-01-30 19:04:46 -08:00
parent 7ced204372 1498cd4e05
commit a0d82b17c7
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.go
View File

@ -43,7 +43,7 @@ func DaemonConfigFromJob(job *engine.Job) *DaemonConfig {
} else { } else {
config.BridgeIface = DefaultNetworkBridge config.BridgeIface = DefaultNetworkBridge
} }
if mtu := job.GetenvInt("Mtu"); mtu != -1 { if mtu := job.GetenvInt("Mtu"); mtu != 0 {
config.Mtu = mtu config.Mtu = mtu
} else { } else {
config.Mtu = DefaultNetworkMtu config.Mtu = DefaultNetworkMtu

2
engine/env.go
View File

@ -60,7 +60,7 @@ func (env *Env) GetInt64(key string) int64 {
s := strings.Trim(env.Get(key), " \t") s := strings.Trim(env.Get(key), " \t")
val, err := strconv.ParseInt(s, 10, 64) val, err := strconv.ParseInt(s, 10, 64)
if err != nil { if err != nil {
return -1 return 0
} }
return val return val
} }

2
engine/env_test.go
View File

@ -62,7 +62,7 @@ func TestSetenvInt(t *testing.T) {
if val := job.GetenvInt("bar"); val != 42 { if val := job.GetenvInt("bar"); val != 42 {
t.Fatalf("GetenvInt returns incorrect value: %d", val) t.Fatalf("GetenvInt returns incorrect value: %d", val)
} }
if val := job.GetenvInt("nonexistent"); val != -1 { if val := job.GetenvInt("nonexistent"); val != 0 {
t.Fatalf("GetenvInt returns incorrect value: %d", val) t.Fatalf("GetenvInt returns incorrect value: %d", val)
} }
} }

4
engine/job.go
View File

@ -102,6 +102,10 @@ func (job *Job) String() string {
return fmt.Sprintf("%s.%s%s", job.Eng, job.CallString(), job.StatusString()) return fmt.Sprintf("%s.%s%s", job.Eng, job.CallString(), job.StatusString())
} }
func (job *Job) EnvExists(key string) (value bool) {
return job.env.Exists(key)
}
func (job *Job) Getenv(key string) (value string) { func (job *Job) Getenv(key string) (value string) {
return job.env.Get(key) return job.env.Get(key)
} }

26
server.go
View File

@ -1083,7 +1083,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
}, -1) }, -1)
for _, container := range srv.runtime.List() { for _, container := range srv.runtime.List() {
if !container.State.IsRunning() && !all && n == -1 && since == "" && before == "" { if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" {
continue continue
} }
if before != "" && !foundBefore { if before != "" && !foundBefore {
@ -1092,7 +1092,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
} }
continue continue
} }
if displayed == n { if n > 0 && displayed == n {
break break
} }
if container.ID == since || utils.TruncateID(container.ID) == since { if container.ID == since || utils.TruncateID(container.ID) == since {
@ -1742,7 +1742,7 @@ func (srv *Server) ContainerCreate(job *engine.Job) engine.Status {
return engine.StatusErr return engine.StatusErr
} }
config := ContainerConfigFromJob(job) config := ContainerConfigFromJob(job)
if config.Memory > 0 && config.Memory < 524288 { if config.Memory != 0 && config.Memory < 524288 {
job.Errorf("Minimum memory limit allowed is 512k") job.Errorf("Minimum memory limit allowed is 512k")
return engine.StatusErr return engine.StatusErr
} }
@ -1798,10 +1798,12 @@ func (srv *Server) ContainerRestart(job *engine.Job) engine.Status {
job.Errorf("Usage: %s CONTAINER\n", job.Name) job.Errorf("Usage: %s CONTAINER\n", job.Name)
return engine.StatusErr return engine.StatusErr
} }
name := job.Args[0] var (
t := job.GetenvInt("t") name = job.Args[0]
if t == -1 { t = 10
t = 10 )
if job.EnvExists("t") {
t = job.GetenvInt("t")
} }
if container := srv.runtime.Get(name); container != nil { if container := srv.runtime.Get(name); container != nil {
if err := container.Restart(int(t)); err != nil { if err := container.Restart(int(t)); err != nil {
@ -2239,10 +2241,12 @@ func (srv *Server) ContainerStop(job *engine.Job) engine.Status {
job.Errorf("Usage: %s CONTAINER\n", job.Name) job.Errorf("Usage: %s CONTAINER\n", job.Name)
return engine.StatusErr return engine.StatusErr
} }
name := job.Args[0] var (
t := job.GetenvInt("t") name = job.Args[0]
if t == -1 { t = 10
t = 10 )
if job.EnvExists("t") {
t = job.GetenvInt("t")
} }
if container := srv.runtime.Get(name); container != nil { if container := srv.runtime.Get(name); container != nil {
if err := container.Stop(int(t)); err != nil { if err := container.Stop(int(t)); err != nil {