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

Add missing fields in compose/types 

Even though those fields are not supported by `docker stack deploy`
they are defined in versions `3.x` of compose schema, so the `compose`
package should be able to marshal/unmarshal them.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-07-26 17:04:22 +02:00
parent effe36a155
commit d13e2df65b
No known key found for this signature in database
GPG Key ID: 083CC6FD6EB699A3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,13 +135,16 @@ type ServiceConfig struct {
Restart string `yaml:",omitempty"` Restart string `yaml:",omitempty"`
Secrets []ServiceSecretConfig `yaml:",omitempty"` Secrets []ServiceSecretConfig `yaml:",omitempty"`
SecurityOpt []string `mapstructure:"security_opt" yaml:"security_opt,omitempty"` SecurityOpt []string `mapstructure:"security_opt" yaml:"security_opt,omitempty"`
ShmSize string `mapstructure:"shm_size" yaml:"shm_size,omitempty"`
StdinOpen bool `mapstructure:"stdin_open" yaml:"stdin_open,omitempty"` StdinOpen bool `mapstructure:"stdin_open" yaml:"stdin_open,omitempty"`
StopGracePeriod *time.Duration `mapstructure:"stop_grace_period" yaml:"stop_grace_period,omitempty"` StopGracePeriod *time.Duration `mapstructure:"stop_grace_period" yaml:"stop_grace_period,omitempty"`
StopSignal string `mapstructure:"stop_signal" yaml:"stop_signal,omitempty"` StopSignal string `mapstructure:"stop_signal" yaml:"stop_signal,omitempty"`
Sysctls StringList `yaml:",omitempty"`
Tmpfs StringList `yaml:",omitempty"` Tmpfs StringList `yaml:",omitempty"`
Tty bool `mapstructure:"tty" yaml:"tty,omitempty"` Tty bool `mapstructure:"tty" yaml:"tty,omitempty"`
Ulimits map[string]*UlimitsConfig `yaml:",omitempty"` Ulimits map[string]*UlimitsConfig `yaml:",omitempty"`
User string `yaml:",omitempty"` User string `yaml:",omitempty"`
UserNSMode string `mapstructure:"userns_mode" yaml:"userns_mode,omitempty"`
Volumes []ServiceVolumeConfig `yaml:",omitempty"` Volumes []ServiceVolumeConfig `yaml:",omitempty"`
WorkingDir string `mapstructure:"working_dir" yaml:"working_dir,omitempty"` WorkingDir string `mapstructure:"working_dir" yaml:"working_dir,omitempty"`