-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(desktop): add Docker Desktop detection and client skeleton
Use the system info Engine API to auto-discover the Desktop integration API endpoint (a local `AF_UNIX` socket or named pipe). If present and responding to a `/ping`, the client is populated on the Compose service for use. Otherwise, it's left `nil`, and Compose will not try to use any functionality that relies on Docker Desktop (e.g. opening `docker-desktop://` deep links to the GUI). Signed-off-by: Milas Bowman <milas.bowman@docker.com>
- Loading branch information
Showing
9 changed files
with
229 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
package desktop | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"fmt" | ||
"net" | ||
"net/http" | ||
"strings" | ||
|
||
"github.com/docker/compose/v2/internal/memnet" | ||
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" | ||
) | ||
|
||
// Client for integration with Docker Desktop features. | ||
type Client struct { | ||
client *http.Client | ||
} | ||
|
||
// NewClient creates a Desktop integration client for the provided in-memory | ||
// socket address (AF_UNIX or named pipe). | ||
func NewClient(apiEndpoint string) *Client { | ||
var transport http.RoundTripper = &http.Transport{ | ||
DisableCompression: true, | ||
DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) { | ||
return memnet.DialEndpoint(ctx, apiEndpoint) | ||
}, | ||
} | ||
transport = otelhttp.NewTransport(transport) | ||
|
||
c := &Client{ | ||
client: &http.Client{Transport: transport}, | ||
} | ||
return c | ||
} | ||
|
||
// Close releases any open connections. | ||
func (c *Client) Close() error { | ||
c.client.CloseIdleConnections() | ||
return nil | ||
} | ||
|
||
type PingResponse struct { | ||
ServerTime int64 `json:"serverTime"` | ||
} | ||
|
||
// Ping is a minimal API used to ensure that the server is available. | ||
func (c *Client) Ping(ctx context.Context) (*PingResponse, error) { | ||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, backendURL("/ping"), http.NoBody) | ||
if err != nil { | ||
return nil, err | ||
} | ||
resp, err := c.client.Do(req) | ||
if err != nil { | ||
return nil, err | ||
} | ||
defer func() { | ||
_ = resp.Body.Close() | ||
}() | ||
if resp.StatusCode != http.StatusOK { | ||
return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode) | ||
} | ||
|
||
var ret PingResponse | ||
if err := json.NewDecoder(resp.Body).Decode(&ret); err != nil { | ||
return nil, err | ||
} | ||
return &ret, nil | ||
} | ||
|
||
// backendURL generates a URL for the given API path. | ||
// | ||
// NOTE: Custom transport handles communication. The host is to create a valid | ||
// URL for the Go http.Client that is also descriptive in error/logs. | ||
func backendURL(path string) string { | ||
return "http://docker-desktop/" + strings.TrimPrefix(path, "/") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package desktop | ||
|
||
import ( | ||
"context" | ||
) | ||
|
||
type IntegrationService interface { | ||
MaybeEnableDesktopIntegration(ctx context.Context) error | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package memnet | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"net" | ||
"strings" | ||
) | ||
|
||
func DialEndpoint(ctx context.Context, endpoint string) (net.Conn, error) { | ||
if addr, ok := strings.CutPrefix(endpoint, "unix://"); ok { | ||
return Dial(ctx, "unix", addr) | ||
} | ||
if addr, ok := strings.CutPrefix(endpoint, "npipe://"); ok { | ||
return Dial(ctx, "npipe", addr) | ||
} | ||
return nil, fmt.Errorf("unsupported protocol for address: %s", endpoint) | ||
} | ||
|
||
func Dial(ctx context.Context, network, addr string) (net.Conn, error) { | ||
var d net.Dialer | ||
switch network { | ||
case "unix": | ||
if err := validateSocketPath(addr); err != nil { | ||
return nil, err | ||
} | ||
return d.DialContext(ctx, "unix", addr) | ||
case "npipe": | ||
// N.B. this will return an error on non-Windows | ||
return dialNamedPipe(ctx, addr) | ||
default: | ||
return nil, fmt.Errorf("unsupported network: %s", network) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
package compose | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
"fmt" | ||
"io/fs" | ||
"os" | ||
"strconv" | ||
"strings" | ||
|
||
"github.com/docker/compose/v2/internal/desktop" | ||
"github.com/sirupsen/logrus" | ||
) | ||
|
||
const engineLabelDesktopAddress = "com.docker.desktop.address" | ||
|
||
var _ desktop.IntegrationService = &composeService{} | ||
|
||
// MaybeEnableDesktopIntegration initializes the desktop.Client instance if | ||
// the server info from the Docker Engine is a Docker Desktop instance. | ||
// | ||
// EXPERIMENTAL: Requires `COMPOSE_EXPERIMENTAL_DESKTOP=1` env var set. | ||
func (s *composeService) MaybeEnableDesktopIntegration(ctx context.Context) error { | ||
if desktopEnabled, _ := strconv.ParseBool(os.Getenv("COMPOSE_EXPERIMENTAL_DESKTOP")); !desktopEnabled { | ||
return nil | ||
} | ||
|
||
info, err := s.dockerCli.Client().Info(ctx) | ||
if err != nil { | ||
return fmt.Errorf("querying server info: %w", err) | ||
} | ||
for _, l := range info.Labels { | ||
k, v, ok := strings.Cut(l, "=") | ||
if !ok || k != engineLabelDesktopAddress { | ||
continue | ||
} | ||
|
||
if path, ok := strings.CutPrefix(v, "unix://"); ok { | ||
// ensure there's no old/stale socket file (not needed for named pipes) | ||
if err := os.Remove(path); err != nil && !errors.Is(err, fs.ErrNotExist) { | ||
return fmt.Errorf("inspecting Desktop socket: %w", err) | ||
} | ||
} | ||
|
||
desktopCli := desktop.NewClient(v) | ||
_, err := desktopCli.Ping(ctx) | ||
if err != nil { | ||
return fmt.Errorf("pinging Desktop API: %w", err) | ||
} | ||
logrus.Debugf("Enabling Docker Desktop integration (experimental): %s", v) | ||
s.desktopCli = desktopCli | ||
return nil | ||
} | ||
|
||
logrus.Trace("Docker Desktop not detected, no integration enabled") | ||
return nil | ||
} |