remove empty line and fixed container names

Signed-off-by: Anca Iordache <anca.iordache@docker.com>

Author: Anca Iordache

e2e/compatibility_test.go

@@ -24,15 +24,13 @@ const (
 )
 
 func loadAndTagImage(info dindSwarmAndRegistryInfo, tmpDir *fs.Dir, tag string, url string) error {
-
 	err := downloadImageTarball(tmpDir.Join("image.tar"), url)
 	if err != nil {
 		return err
 	}
 
-	combined := info.dockerCmd("load", "-q", "-i", tmpDir.Join("image.tar"))
-
 	digest := ""
+	combined := info.dockerCmd("load", "-q", "-i", tmpDir.Join("image.tar"))
 	for _, line := range strings.Split(combined, "\n") {
 		if strings.Contains(line, "sha256:") {
 			digest = strings.Split(line, "sha256:")[1]

e2e/helper_test.go

@@ -87,13 +87,13 @@ func runWithDindSwarmAndRegistry(t *testing.T, todo func(dindSwarmAndRegistryInf
 	// Solution found is: use host external IP (not loopback) so accessing from within installer container will reach the right container
 
 	registry := NewContainer("registry:2", 5000)
-	registry.Start(t, "--name", "registry", "-e", "REGISTRY_VALIDATION_MANIFESTS_URLS_ALLOW=[^http]",
+	registry.Start(t, "-e", "REGISTRY_VALIDATION_MANIFESTS_URLS_ALLOW=[^http]",
 		"-e", "REGISTRY_HTTP_ADDR=0.0.0.0:5000")
 	defer registry.StopNoFail()
 	registryAddress := registry.GetAddress(t)
 
 	swarm := NewContainer("docker:19.03.3-dind", 2375, "--insecure-registry", registryAddress)
-	swarm.Start(t, "--name", "dind", "-e", "DOCKER_TLS_CERTDIR=") // Disable certificate generate on DinD startup
+	swarm.Start(t, "-e", "DOCKER_TLS_CERTDIR=") // Disable certificate generate on DinD startup
 	defer swarm.Stop(t)
 	swarmAddress := swarm.GetAddress(t)
 
@@ -117,7 +117,7 @@ func runWithDindSwarmAndRegistry(t *testing.T, todo func(dindSwarmAndRegistryInf
 	runner.localCmd = runLocalCmd
 	runner.dockerCmd = runDockerCmd
 	runner.execCmd = func(params ...string) string {
-		args := append([]string{"docker", "exec", "-t", "dind"}, params...)
+		args := append([]string{"docker", "exec", "-t", swarm.container}, params...)
 		return runLocalCmd(args...)
 	}
 	todo(runner)