From 0c9b232bf5263ab896637b394308510c4cfbd45d Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 6 Nov 2019 18:29:17 -0500
Subject: [PATCH] Remove unused GlobalFlags

Signed-off-by: Sam Whited <sam@samwhited.com>
---
 testutil/daemon/daemon.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go
index 6a1b97fe17..c26c5c5280 100644
--- a/testutil/daemon/daemon.go
+++ b/testutil/daemon/daemon.go
@@ -57,7 +57,6 @@ type clientConfig struct {
 
 // Daemon represents a Docker daemon for the testing framework
 type Daemon struct {
-	GlobalFlags       []string
 	Root              string
 	Folder            string
 	Wait              chan error
@@ -256,17 +255,17 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
 		d.pidFile = filepath.Join(d.Folder, "docker.pid")
 	}
 
-	d.args = append(d.GlobalFlags, "--data-root", d.Root)
-	if d.containerdSocket != "" {
-		d.args = append(d.args, "--containerd", d.containerdSocket)
-	}
-	d.args = append(d.args,
+	d.args = []string{
+		"--data-root", d.Root,
 		"--exec-root", d.execRoot,
 		"--pidfile", d.pidFile,
 		fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
 		"--containerd-namespace", d.id,
-		"--containerd-plugins-namespace", d.id+"p",
-	)
+		"--containerd-plugins-namespace", d.id + "p",
+	}
+	if d.containerdSocket != "" {
+		d.args = append(d.args, "--containerd", d.containerdSocket)
+	}
 
 	if d.defaultCgroupNamespaceMode != "" {
 		d.args = append(d.args, "--default-cgroupns-mode", d.defaultCgroupNamespaceMode)