Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore(deps): vendor docker buildkit clientopts function
Kyle Mendell8387d57defe6
diff --git a/backend/go.mod b/backend/go.modindex cb3e72855..74cc8967c 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -18,7 +18,6 @@ require (github.com/depot/depot-go v0.5.2github.com/docker/cli v29.3.1+incompatiblegithub.com/docker/compose/v5 v5.1.1- github.com/docker/docker v28.5.2+incompatiblegithub.com/fsnotify/fsnotify v1.9.0github.com/getarcaneapp/arcane/cli v1.16.3github.com/getarcaneapp/arcane/types v1.16.4@@ -104,6 +103,7 @@ require (github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirectgithub.com/distribution/reference v0.6.0 // indirectgithub.com/docker/buildx v0.31.1 // indirect+ github.com/docker/docker v28.5.2+incompatible // indirectgithub.com/docker/docker-credential-helpers v0.9.5 // indirectgithub.com/docker/go-connections v0.6.0 // indirectgithub.com/docker/go-units v0.5.0 // indirectdiff --git a/backend/pkg/dockerutil/buildkit.go b/backend/pkg/dockerutil/buildkit.gonew file mode 100644index 000000000..9e2f5c121--- /dev/null+++ b/backend/pkg/dockerutil/buildkit.go@@ -0,0 +1,37 @@+package docker++import (+ "context"+ "net"++ bkclient "github.com/moby/buildkit/client"+ "github.com/moby/moby/client"+)++/*+This code is adapted from:+https://github.com/moby/moby/blob/v28.5.2/client/buildkit/buildkit.go++Original source: moby/moby+License: Apache-2.0 (https://github.com/moby/moby/blob/v28.5.2/LICENSE)++Changes for Arcane: package name and client import path adjusted.+*/++// ClientOpts returns a list of buildkit client options which allows the+// caller to create a buildkit client which will connect to the buildkit+// API provided by the daemon. These options can be passed to [bkclient.New].+//+// Example:+//+// bkclient.New(ctx, "", ClientOpts(c)...)+func ClientOpts(c client.HijackDialer) []bkclient.ClientOpt {+ return []bkclient.ClientOpt{+ bkclient.WithSessionDialer(func(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error) {+ return c.DialHijack(ctx, "/session", proto, meta)+ }),+ bkclient.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {+ return c.DialHijack(ctx, "/grpc", "h2c", nil)+ }),+ }+}diff --git a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go b/backend/pkg/libarcane/libbuild/builder_buildkit_local.goindex 8c96e340b..dc2656270 100644--- a/backend/pkg/libarcane/libbuild/builder_buildkit_local.go+++ b/backend/pkg/libarcane/libbuild/builder_buildkit_local.go@@ -8,7 +8,7 @@ import ("strings""time"- dockerbuildkit "github.com/docker/docker/client/buildkit"+ docker "github.com/getarcaneapp/arcane/backend/pkg/dockerutil"imagetypes "github.com/getarcaneapp/arcane/types/image"buildkitclient "github.com/moby/buildkit/client")@@ -23,7 +23,7 @@ func (b *builder) newLocalBuildkitSessionInternal(ctx context.Context) (*buildSereturn nil, fmt.Errorf("failed to connect to Docker: %w", err)}- bk, err := buildkitclient.New(ctx, "", dockerbuildkit.ClientOpts(dockerClient)...)+ bk, err := buildkitclient.New(ctx, "", docker.ClientOpts(dockerClient)...)if err != nil {return nil, fmt.Errorf("failed to connect to Docker BuildKit: %w", err)}