From 7adb6ee3a83f4fa83f01a5710bc2d9a2a8402d6b Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Thu, 29 Sep 2016 21:47:31 -0700
Subject: [PATCH] Add omitempty to EngineOpts tags

---
 config/types.go | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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