test: details link support in experimental mode

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

tests/build.go

@@ -461,47 +461,45 @@ RUN busybox | head -1 | grep v1.36.1
 
 func testBuildDetailsLink(t *testing.T, sb integration.Sandbox) {
 	skipNoCompatBuildKit(t, sb, ">= 0.11.0-0", "build details link")
+	home := t.TempDir()
 	buildDetailsPattern := regexp.MustCompile(`(?m)^View build details: docker-desktop://dashboard/build/[^/]+/[^/]+/[^/]+\n$`)
 
 	// build simple dockerfile
 	dockerfile := []byte(`FROM busybox:latest
 RUN echo foo > /bar`)
 	dir := tmpdir(t, fstest.CreateFile("Dockerfile", dockerfile, 0600))
-	cmd := buildxCmd(sb, withArgs("build", "--output=type=cacheonly", dir))
+	cmd := buildxCmd(sb,
+		withArgs("build", "--output=type=cacheonly", dir),
+		withEnv(fmt.Sprintf("HOME=%s", home)),
+	)
 	out, err := cmd.CombinedOutput()
 	require.NoError(t, err, string(out))
 	require.False(t, buildDetailsPattern.MatchString(string(out)), fmt.Sprintf("build details link not expected in output, got %q", out))
 
 	// create desktop-build .lastaccess file
-	home, err := os.UserHomeDir() // TODO: sandbox should create a temp home dir and expose it through its interface
-	require.NoError(t, err)
 	dbDir := path.Join(home, ".docker", "desktop-build")
 	require.NoError(t, os.MkdirAll(dbDir, 0755))
-	dblaFile, err := os.Create(path.Join(dbDir, ".lastaccess"))
+	dblaLastaccess, err := os.Create(path.Join(dbDir, ".lastaccess"))
 	require.NoError(t, err)
-	defer func() {
-		dblaFile.Close()
-		if err := os.Remove(dblaFile.Name()); err != nil {
-			t.Fatal(err)
-		}
-	}()
+	require.NoError(t, dblaLastaccess.Close())
 
 	// build again
-	cmd = buildxCmd(sb, withArgs("build", "--output=type=cacheonly", dir))
+	cmd = buildxCmd(sb,
+		withArgs("build", "--output=type=cacheonly", dir),
+		withEnv(fmt.Sprintf("HOME=%s", home)),
+	)
 	out, err = cmd.CombinedOutput()
 	require.NoError(t, err, string(out))
 	require.True(t, buildDetailsPattern.MatchString(string(out)), fmt.Sprintf("expected build details link in output, got %q", out))
 
-	if isExperimental() {
-		// FIXME: https://github.com/docker/buildx/issues/2382
-		t.Skip("build details link not displayed in experimental mode when build fails: https://github.com/docker/buildx/issues/2382")
-	}
-
 	// build erroneous dockerfile
 	dockerfile = []byte(`FROM busybox:latest
 RUN exit 1`)
 	dir = tmpdir(t, fstest.CreateFile("Dockerfile", dockerfile, 0600))
-	cmd = buildxCmd(sb, withArgs("build", "--output=type=cacheonly", dir))
+	cmd = buildxCmd(sb,
+		withArgs("build", "--output=type=cacheonly", dir),
+		withEnv(fmt.Sprintf("HOME=%s", home)),
+	)
 	out, err = cmd.CombinedOutput()
 	require.Error(t, err, string(out))
 	require.True(t, buildDetailsPattern.MatchString(string(out)), fmt.Sprintf("expected build details link in output, got %q", out))

tests/integration.go

@@ -62,7 +62,10 @@ func buildxCmd(sb integration.Sandbox, opts ...cmdOpt) *exec.Cmd {
 		)
 	}
 	if context := sb.DockerAddress(); context != "" {
-		cmd.Env = append(cmd.Env, "DOCKER_CONTEXT="+context)
+		cmd.Env = append(cmd.Env,
+			"DOCKER_CONFIG="+dockerConfig(sb),
+			"DOCKER_CONTEXT="+context,
+		)
 	}
 	if isExperimental() {
 		cmd.Env = append(cmd.Env, "BUILDX_EXPERIMENTAL=1")
@@ -94,6 +97,13 @@ func buildxConfig(sb integration.Sandbox) string {
 	return ""
 }
 
+func dockerConfig(sb integration.Sandbox) string {
+	if context := sb.DockerAddress(); context != "" {
+		return "/tmp/docker-" + context
+	}
+	return ""
+}
+
 func isMobyWorker(sb integration.Sandbox) bool {
 	name, hasFeature := driverName(sb.Name())
 	return name == "docker" && !hasFeature