Merge component 'engine' from git@github.com:moby/moby master

2018-01-12 17:04:42 +00:00
parent e1c32a9951 4bf05acc16
commit 298483e61f
1 changed files with 2 additions and 2 deletions
--- a/components/engine/integration/container/restart_test.go
+++ b/components/engine/integration/container/restart_test.go
@ -59,9 +59,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
 						t.Fatal(err)
 					}

-					var args []string
+					args := []string{"--iptables=false"}
 					if liveRestoreEnabled {
-						args = []string{"--live-restore"}
+						args = append(args, "--live-restore")
 					}

 					d.StartWithBusybox(t, args...)