dap: make dap generally available

commands/dap.go

@@ -8,7 +8,6 @@ import (
 	"github.com/containerd/console"
 	"github.com/docker/buildx/dap"
 	"github.com/docker/buildx/dap/common"
-	"github.com/docker/buildx/util/cobrautil"
 	"github.com/docker/buildx/util/ioset"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli"
@@ -29,7 +28,6 @@ func dapCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 
 		DisableFlagsInUseLine: true,
 	}
-	cobrautil.MarkCommandExperimental(cmd)
 
 	dapBuildCmd := buildCmd(dockerCli, rootOpts, &options)
 	dapBuildCmd.Args = cobra.RangeArgs(0, 1)

commands/root.go

@@ -127,10 +127,10 @@ func addCommands(cmd *cobra.Command, opts *rootOptions, dockerCli command.Cli) {
 		duCmd(dockerCli, opts),
 		imagetoolscmd.RootCmd(cmd, dockerCli, imagetoolscmd.RootOptions{Builder: &opts.builder}),
 		historycmd.RootCmd(cmd, dockerCli, historycmd.RootOptions{Builder: &opts.builder}),
+		dapCmd(dockerCli, opts),
 	)
 	if confutil.IsExperimental() {
 		cmd.AddCommand(debugCmd(dockerCli, opts))
-		cmd.AddCommand(dapCmd(dockerCli, opts))
 	}
 
 	cmd.RegisterFlagCompletionFunc( //nolint:errcheck

dap/debug_shell.go

@@ -251,9 +251,6 @@ func (s *shell) SendRunInTerminalRequest(ctx Context) error {
 		Arguments: dap.RunInTerminalRequestArguments{
 			Kind: "integrated",
 			Args: args,
-			Env: map[string]any{
-				"BUILDX_EXPERIMENTAL": "1",
-			},
 		},
 	}
 

dap/eval.go

@@ -1,14 +1,8 @@
 package dap
 
 import (
-	"context"
 	"fmt"
-	"net"
-	"os"
-	"path/filepath"
 
-	"github.com/docker/buildx/build"
-	"github.com/docker/cli/cli-plugins/metadata"
 	"github.com/google/go-dap"
 	"github.com/google/shlex"
 	"github.com/pkg/errors"
@@ -86,95 +80,3 @@ func replCmd[Flags any, RetVal any](ctx Context, name string, resp *dap.Evaluate
 		},
 	}, flags
 }
-
-func (t *thread) Exec(ctx Context, args []string) (message string, retErr error) {
-	if t.rCtx == nil {
-		return "", errors.New("no container context for exec")
-	}
-
-	cfg := &build.InvokeConfig{Tty: true}
-	if len(cfg.Entrypoint) == 0 && len(cfg.Cmd) == 0 {
-		cfg.Entrypoint = []string{"/bin/sh"} // launch shell by default
-		cfg.Cmd = []string{}
-		cfg.NoCmd = false
-	}
-
-	ctr, err := build.NewContainer(ctx, t.rCtx, cfg)
-	if err != nil {
-		return "", err
-	}
-	defer func() {
-		if retErr != nil {
-			ctr.Cancel()
-		}
-	}()
-
-	dir, err := os.MkdirTemp("", "buildx-dap-exec")
-	if err != nil {
-		return "", err
-	}
-	defer func() {
-		if retErr != nil {
-			os.RemoveAll(dir)
-		}
-	}()
-
-	socketPath := filepath.Join(dir, "s.sock")
-	lc := net.ListenConfig{}
-	l, err := lc.Listen(ctx, "unix", socketPath)
-	if err != nil {
-		return "", err
-	}
-
-	go func() {
-		defer os.RemoveAll(dir)
-		t.runExec(l, ctr, cfg)
-	}()
-
-	// TODO: this should work in standalone mode too.
-	docker := os.Getenv(metadata.ReexecEnvvar)
-	req := &dap.RunInTerminalRequest{
-		Request: dap.Request{
-			Command: "runInTerminal",
-		},
-		Arguments: dap.RunInTerminalRequestArguments{
-			Kind: "integrated",
-			Args: []string{docker, "buildx", "dap", "attach", socketPath},
-			Env: map[string]any{
-				"BUILDX_EXPERIMENTAL": "1",
-			},
-		},
-	}
-
-	resp := ctx.Request(req)
-	if !resp.GetResponse().Success {
-		return "", errors.New(resp.GetResponse().Message)
-	}
-
-	message = fmt.Sprintf("Started process attached to %s.", socketPath)
-	return message, nil
-}
-
-func (t *thread) runExec(l net.Listener, ctr *build.Container, cfg *build.InvokeConfig) {
-	defer l.Close()
-	defer ctr.Cancel()
-
-	conn, err := l.Accept()
-	if err != nil {
-		return
-	}
-	defer conn.Close()
-
-	// start a background goroutine to politely refuse any subsequent connections.
-	go func() {
-		for {
-			conn, err := l.Accept()
-			if err != nil {
-				return
-			}
-			fmt.Fprint(conn, "Error: Already connected to exec instance.")
-			conn.Close()
-		}
-	}()
-	ctr.Exec(context.Background(), cfg, conn, conn, conn)
-}

docs/reference/buildx.md

@@ -9,25 +9,25 @@ Extended build capabilities with BuildKit
 
 ### Subcommands
 
-| Name                                 | Description                                                     |
-|:-------------------------------------|:----------------------------------------------------------------|
-| [`bake`](buildx_bake.md)             | Build from a file                                               |
-| [`build`](buildx_build.md)           | Start a build                                                   |
-| [`create`](buildx_create.md)         | Create a new builder instance                                   |
-| [`dap`](buildx_dap.md)               | Start debug adapter protocol compatible debugger (EXPERIMENTAL) |
-| [`debug`](buildx_debug.md)           | Start debugger (EXPERIMENTAL)                                   |
-| [`dial-stdio`](buildx_dial-stdio.md) | Proxy current stdio streams to builder instance                 |
-| [`du`](buildx_du.md)                 | Disk usage                                                      |
-| [`history`](buildx_history.md)       | Commands to work on build records                               |
-| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry                          |
-| [`inspect`](buildx_inspect.md)       | Inspect current builder instance                                |
-| [`ls`](buildx_ls.md)                 | List builder instances                                          |
-| [`policy`](buildx_policy.md)         | Commands for working with build policies                        |
-| [`prune`](buildx_prune.md)           | Remove build cache                                              |
-| [`rm`](buildx_rm.md)                 | Remove one or more builder instances                            |
-| [`stop`](buildx_stop.md)             | Stop builder instance                                           |
-| [`use`](buildx_use.md)               | Set the current builder instance                                |
-| [`version`](buildx_version.md)       | Show buildx version information                                 |
+| Name                                 | Description                                      |
+|:-------------------------------------|:-------------------------------------------------|
+| [`bake`](buildx_bake.md)             | Build from a file                                |
+| [`build`](buildx_build.md)           | Start a build                                    |
+| [`create`](buildx_create.md)         | Create a new builder instance                    |
+| [`dap`](buildx_dap.md)               | Start debug adapter protocol compatible debugger |
+| [`debug`](buildx_debug.md)           | Start debugger (EXPERIMENTAL)                    |
+| [`dial-stdio`](buildx_dial-stdio.md) | Proxy current stdio streams to builder instance  |
+| [`du`](buildx_du.md)                 | Disk usage                                       |
+| [`history`](buildx_history.md)       | Commands to work on build records                |
+| [`imagetools`](buildx_imagetools.md) | Commands to work on images in registry           |
+| [`inspect`](buildx_inspect.md)       | Inspect current builder instance                 |
+| [`ls`](buildx_ls.md)                 | List builder instances                           |
+| [`policy`](buildx_policy.md)         | Commands for working with build policies         |
+| [`prune`](buildx_prune.md)           | Remove build cache                               |
+| [`rm`](buildx_rm.md)                 | Remove one or more builder instances             |
+| [`stop`](buildx_stop.md)             | Stop builder instance                            |
+| [`use`](buildx_use.md)               | Set the current builder instance                 |
+| [`version`](buildx_version.md)       | Show buildx version information                  |
 
 
 ### Options

docs/reference/buildx_dap.md

@@ -1,7 +1,7 @@
 # docker buildx dap
 
 <!---MARKER_GEN_START-->
-Start debug adapter protocol compatible debugger (EXPERIMENTAL)
+Start debug adapter protocol compatible debugger
 
 ### Subcommands
 

tests/dap_build.go

@@ -23,10 +23,6 @@ import (
 )
 
 func dapBuildCmd(t *testing.T, sb integration.Sandbox, opts ...cmdOpt) (*daptest.Client, func(interrupt bool) error, error) {
-	if !isExperimental() {
-		t.Skip("only testing when experimental is enabled")
-	}
-
 	opts = append([]cmdOpt{withArgs("dap", "build")}, opts...)
 
 	cmd := buildxCmd(sb, opts...)