Merge remote-tracking branch 'origin'

This commit is contained in:
Brad Rydzewski
2019-12-11 13:32:09 -08:00

View File

@@ -101,7 +101,7 @@ type (
Pull string `json:"pull,omitempty"`
Settings map[string]*manifest.Parameter `json:"settings,omitempty"`
Shell string `json:"shell,omitempty"`
ShmSize manifest.BytesSize `json:"shm_size,omitempty"`
ShmSize manifest.BytesSize `json:"shm_size,omitempty" yaml:"shm_size"`
User string `json:"user,omitempty"`
Volumes []*VolumeMount `json:"volumes,omitempty"`
When manifest.Conditions `json:"when,omitempty"`