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

Merge pull request #1170 from vdemeester/omit-silvin 

Add omitempty on compose config top-level types
This commit is contained in:
Silvin 2018-07-02 14:16:53 +02:00 committed by GitHub
parent 981c099b96 f05ab2b1fb
commit 18091ea7e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/command/stack/kubernetes/stackclient_test.go
View File

@ -32,10 +32,6 @@ services:
image: bar image: bar
foo: foo:
image: foo image: foo
networks: {}
volumes: {}
secrets: {}
configs: {}
`), s.ComposeFile) `), s.ComposeFile)
} }

10
cli/compose/types/types.go
View File

@ -73,11 +73,11 @@ type Config struct {
Filename string `yaml:"-"` Filename string `yaml:"-"`
Version string Version string
Services Services Services Services
Networks map[string]NetworkConfig Networks map[string]NetworkConfig `yaml:",omitempty"`
Volumes map[string]VolumeConfig Volumes map[string]VolumeConfig `yaml:",omitempty"`
Secrets map[string]SecretConfig Secrets map[string]SecretConfig `yaml:",omitempty"`
Configs map[string]ConfigObjConfig Configs map[string]ConfigObjConfig `yaml:",omitempty"`
Extras map[string]interface{} `yaml:",inline"` Extras map[string]interface{} `yaml:",inline"`
} }
// Services is a list of ServiceConfig // Services is a list of ServiceConfig