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

abord build if mergeConfig returns an error and fix duplicate error message

Browse source
This commit is contained in:
Victor Vieux 2013-09-20 12:46:24 +00:00
parent a81393787f
commit 5bd0437eed
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api.go
View file

@ -892,8 +892,7 @@ func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Requ
b := NewBuildFile(srv, utils.NewWriteFlusher(w), !suppressOutput, !noCache, rm)
id, err := b.Build(context)
if err != nil {
fmt.Fprintf(w, "Error build: %s\n", err)
return err
return fmt.Errorf("Error build: %s", err)
}
if repoName != "" {
srv.runtime.repositories.Set(repoName, tag, id, false)

4
runtime.go
View file

@ -282,7 +282,9 @@ func (runtime *Runtime) Create(config *Config) (*Container, error) {
}
if img.Config != nil {
MergeConfig(config, img.Config)
if err := MergeConfig(config, img.Config); err != nil {
return nil, err
}
}
if len(config.Entrypoint) != 0 && config.Cmd == nil {

8
utils.go
View file

@ -65,7 +65,7 @@ func CompareConfig(a, b *Config) bool {
return true
}
func MergeConfig(userConf, imageConf *Config) {
func MergeConfig(userConf, imageConf *Config) error {
if userConf.User == "" {
userConf.User = imageConf.User
}
@ -85,7 +85,10 @@ func MergeConfig(userConf, imageConf *Config) {
found := false
imageNat, _ := parseNat(imagePortSpec)
for _, userPortSpec := range userConf.PortSpecs {
userNat, _ := parseNat(userPortSpec)
userNat, err := parseNat(userPortSpec)
if err != nil {
return err
}
if imageNat.Proto == userNat.Proto && imageNat.Backend == userNat.Backend {
found = true
}
@ -146,6 +149,7 @@ func MergeConfig(userConf, imageConf *Config) {
userConf.Volumes[k] = v
}
}
return nil
}
func parseLxcConfOpts(opts ListOpts) ([]KeyValuePair, error) {