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

Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719

Browse source 
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 01b70a95c9)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Vincent Demeester 2016-11-22 13:09:17 +01:00 committed by Victor Vieux
parent 3168635120
commit 9302b0f59c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor.conf
View file

@ -132,7 +132,7 @@ github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72 github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72
# composefile # composefile
github.com/aanand/compose-file a70cb6ea5c403c383b5117dcd1dea78880a47824 github.com/aanand/compose-file a3e58764f50597b6217fec07e9bff7225c4a1719
github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715 github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715
github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45 github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45

7
vendor/github.com/aanand/compose-file/loader/loader.go generated vendored
View file

@ -515,13 +515,12 @@ func toYAMLName(name string) string {
} }
func loadListOrStructMap(value interface{}, target reflect.Type) (interface{}, error) { func loadListOrStructMap(value interface{}, target reflect.Type) (interface{}, error) {
mapValue := reflect.MakeMap(target)
if list, ok := value.([]interface{}); ok { if list, ok := value.([]interface{}); ok {
mapValue := map[interface{}]interface{}{}
for _, name := range list { for _, name := range list {
mapValue.SetMapIndex(reflect.ValueOf(name), reflect.ValueOf(nil)) mapValue[name] = nil
} }
return mapValue.Interface(), nil return mapValue, nil
} }
return value, nil return value, nil