Fix failing test

Author: TinaMor

cmd/nerdctl/builder/builder_build_test.go

@@ -76,30 +76,30 @@ CMD ["echo", "nerdctl-build-test-string"]`, testutil.CommonImage)
 				Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
 			},
 			{
-				Description: "Successfully build with output docker, main tag still works",
+				Description: "Successfully build with output image, main tag still works",
 				Setup: func(data test.Data, helpers test.Helpers) {
-					helpers.Ensure("build", data.Get("buildCtx"), "-t", data.Identifier(), "--output=type=docker,name="+data.Identifier("ignored"))
+					helpers.Ensure("build", data.Get("buildCtx"), "-t", data.Identifier(), "--output=type=image,name="+data.Identifier("ignored"))
 				},
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-					return helpers.Command("run", "--rm", data.Identifier("ignored"))
+					return helpers.Command("run", "--rm", data.Identifier())
 				},
 				Cleanup: func(data test.Data, helpers test.Helpers) {
 					helpers.Anyhow("rmi", "-f", data.Identifier())
 				},
 				Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
 			},
 			{
-				Description: "Successfully build with output docker, name cannot be used",
+				Description: "Successfully build with output docker, named image",
 				Setup: func(data test.Data, helpers test.Helpers) {
-					helpers.Ensure("build", data.Get("buildCtx"), "-t", data.Identifier(), "--output=type=docker,name="+data.Identifier("ignored"))
+					helpers.Ensure("build", data.Get("buildCtx"), "--output=type=docker,name="+data.Identifier())
 				},
 				Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-					return helpers.Command("run", "--rm", data.Identifier("ignored"))
+					return helpers.Command("run", "--rm", data.Identifier())
 				},
 				Cleanup: func(data test.Data, helpers test.Helpers) {
 					helpers.Anyhow("rmi", "-f", data.Identifier())
 				},
-				Expected: test.Expects(-1, nil, nil),
+				Expected: test.Expects(0, nil, test.Equals("nerdctl-build-test-string\n")),
 			},
 		},
 	}

pkg/cmd/builder/build.go

@@ -263,10 +263,7 @@ func generateBuildctlArgs(ctx context.Context, client *containerd.Client, option
 		if err != nil {
 			return result, err
 		}
-		// Update the output with the the image name if it is not already set
-		if !strings.Contains(output, "name=") {
-			output += ",name=" + parsedReference.String()
-		}
+		output += ",name=" + parsedReference.String()
 
 		// pick the first tag and add it to output
 		for idx, tag := range tags {