rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-04 02:26:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1259 from joshwget/omitempty-engineopts

Browse Source 
Add omitempty to EngineOpts tags
This commit is contained in:
Darren Shepherd 2016-09-30 07:31:20 -07:00 committed by GitHub
commit 05a43ceac0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
config/types.go
View File

@ -135,23 +135,23 @@ type UpgradeConfig struct {
} }
type EngineOpts struct { type EngineOpts struct {
Bridge string `yaml:"bridge" opt:"bridge"` Bridge string `yaml:"bridge,omitempty" opt:"bridge"`
ConfigFile string `yaml:"config_file" opt:"config-file"` ConfigFile string `yaml:"config_file,omitempty" opt:"config-file"`
Containerd string `yaml:"containerd" opt:"containerd"` Containerd string `yaml:"containerd,omitempty" opt:"containerd"`
Debug *bool `yaml:"debug" opt:"debug"` Debug *bool `yaml:"debug,omitempty" opt:"debug"`
ExecRoot string `yaml:"exec_root" opt:"exec-root"` ExecRoot string `yaml:"exec_root,omitempty" opt:"exec-root"`
Group string `yaml:"group" opt:"group"` Group string `yaml:"group,omitempty" opt:"group"`
Graph string `yaml:"graph" opt:"graph"` Graph string `yaml:"graph,omitempty" opt:"graph"`
Host string `yaml:"host" opt:"host"` Host string `yaml:"host,omitempty" opt:"host"`
LiveRestore *bool `yaml:"live_restore" opt:"live-restore"` LiveRestore *bool `yaml:"live_restore,omitempty" opt:"live-restore"`
LogDriver string `yaml:"log_driver" opt:"log-driver"` LogDriver string `yaml:"log_driver,omitempty" opt:"log-driver"`
LogOpts map[string]string `yaml:"log_opts" opt:"log-opt"` LogOpts map[string]string `yaml:"log_opts,omitempty" opt:"log-opt"`
PidFile string `yaml:"pid_file" opt:"pidfile"` PidFile string `yaml:"pid_file,omitempty" opt:"pidfile"`
RegistryMirror string `yaml:"registry_mirror" opt:"registry-mirror"` RegistryMirror string `yaml:"registry_mirror,omitempty" opt:"registry-mirror"`
Restart *bool `yaml:"restart" opt:"restart"` Restart *bool `yaml:"restart,omitempty" opt:"restart"`
SelinuxEnabled *bool `yaml:"selinux_enabled" opt:"selinux-enabled"` SelinuxEnabled *bool `yaml:"selinux_enabled,omitempty" opt:"selinux-enabled"`
StorageDriver string `yaml:"storage_driver" opt:"storage-driver"` StorageDriver string `yaml:"storage_driver,omitempty" opt:"storage-driver"`
UserlandProxy *bool `yaml:"userland_proxy" opt:"userland-proxy"` UserlandProxy *bool `yaml:"userland_proxy,omitempty" opt:"userland-proxy"`
} }
type DockerConfig struct { type DockerConfig struct {