Skip to content

fix: support ssh:// DOCKER_HOST via connhelper #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aroberts wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support ssh:// DOCKER_HOST via connhelper #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions pkg/docker/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import (
"context"
"fmt"
"io"
"net/http"
"os"

"github.com/docker/cli/cli/connhelper"
"github.com/docker/cli/cli/streams"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"
Expand All @@ -28,8 +31,28 @@ func NewClient(opts Options) (*Client, error) {
client.FromEnv,
client.WithAPIVersionNegotiation(),
}
if len(opts.Host) > 0 {
dockerOpts = append(dockerOpts, client.WithHost(opts.Host))

host := opts.Host
if host == "" {
host = os.Getenv("DOCKER_HOST")
}
if host != "" {
helper, err := connhelper.GetConnectionHelper(host)
if err != nil {
return nil, fmt.Errorf("cannot resolve Docker connection helper: %w", err)
}
if helper != nil {
httpClient := &http.Client{
Transport: &http.Transport{DialContext: helper.Dialer},
}
dockerOpts = append(dockerOpts,
client.WithHTTPClient(httpClient),
client.WithHost(helper.Host),
client.WithDialContext(helper.Dialer),
)
} else if opts.Host != "" {
dockerOpts = append(dockerOpts, client.WithHost(opts.Host))
}
}

inner, err := client.NewClientWithOpts(dockerOpts...)
Expand Down