Sebastiaan van Stijn
a6335c4226
Some validation steps done by `docker create` (and `docker run`) are platform-
specific, and need to know the daemon's OS.
To get this information, the CLI.ServerInfo() method was used, which
discards connection errors, resulting in an empty OS, which causes
validation to fail with an "unknown server OS" error message.
This patch changes it to use the Client.Ping so that we can error when
failing to connect.
We should look if we can reduce the platform-specific validation and parsing
on the client-side, but at least this change should produce a more useful
error.
Before this patch:
DOCKER_HOST=tcp://example.invalid docker run -it --rm --device=/dev/dri alpine
docker: unknown server OS:
Run 'docker run --help' for more information
With this patch:
DOCKER_HOST=tcp://example.invalid docker run -it --rm --device=/dev/dri alpine
failed to connect to the docker API at tcp://example.invalid:2375: lookup example.invalid on 192.168.65.7:53: no such host
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
239 lines
10 KiB
Go
239 lines
10 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/moby/moby/client"
|
|
)
|
|
|
|
func mockContainerExportResult(content string) client.ContainerExportResult {
|
|
return io.NopCloser(strings.NewReader(content))
|
|
}
|
|
|
|
func mockContainerLogsResult(content string) client.ContainerLogsResult {
|
|
return io.NopCloser(strings.NewReader(content))
|
|
}
|
|
|
|
type fakeStreamResult struct {
|
|
io.ReadCloser
|
|
client.ImagePushResponse // same interface as [client.ImagePushResponse]
|
|
}
|
|
|
|
func (e fakeStreamResult) Read(p []byte) (int, error) { return e.ReadCloser.Read(p) }
|
|
func (e fakeStreamResult) Close() error { return e.ReadCloser.Close() }
|
|
|
|
type fakeClient struct {
|
|
client.Client
|
|
inspectFunc func(string) (client.ContainerInspectResult, error)
|
|
execInspectFunc func(execID string) (client.ExecInspectResult, error)
|
|
execCreateFunc func(containerID string, options client.ExecCreateOptions) (client.ExecCreateResult, error)
|
|
createContainerFunc func(options client.ContainerCreateOptions) (client.ContainerCreateResult, error)
|
|
containerStartFunc func(containerID string, options client.ContainerStartOptions) (client.ContainerStartResult, error)
|
|
imagePullFunc func(ctx context.Context, parentReference string, options client.ImagePullOptions) (client.ImagePullResponse, error)
|
|
infoFunc func() (client.SystemInfoResult, error)
|
|
containerStatPathFunc func(containerID, path string) (client.ContainerStatPathResult, error)
|
|
containerCopyFromFunc func(containerID, srcPath string) (client.CopyFromContainerResult, error)
|
|
logFunc func(string, client.ContainerLogsOptions) (client.ContainerLogsResult, error)
|
|
waitFunc func(string) client.ContainerWaitResult
|
|
containerListFunc func(client.ContainerListOptions) (client.ContainerListResult, error)
|
|
containerExportFunc func(string) (client.ContainerExportResult, error)
|
|
containerExecResizeFunc func(id string, options client.ExecResizeOptions) (client.ExecResizeResult, error)
|
|
containerRemoveFunc func(ctx context.Context, containerID string, options client.ContainerRemoveOptions) (client.ContainerRemoveResult, error)
|
|
containerRestartFunc func(ctx context.Context, containerID string, options client.ContainerRestartOptions) (client.ContainerRestartResult, error)
|
|
containerStopFunc func(ctx context.Context, containerID string, options client.ContainerStopOptions) (client.ContainerStopResult, error)
|
|
containerKillFunc func(ctx context.Context, containerID string, options client.ContainerKillOptions) (client.ContainerKillResult, error)
|
|
containerPruneFunc func(ctx context.Context, options client.ContainerPruneOptions) (client.ContainerPruneResult, error)
|
|
containerAttachFunc func(ctx context.Context, containerID string, options client.ContainerAttachOptions) (client.ContainerAttachResult, error)
|
|
containerDiffFunc func(ctx context.Context, containerID string) (client.ContainerDiffResult, error)
|
|
containerRenameFunc func(ctx context.Context, oldName, newName string) error
|
|
containerCommitFunc func(ctx context.Context, container string, options client.ContainerCommitOptions) (client.ContainerCommitResult, error)
|
|
containerPauseFunc func(ctx context.Context, container string, options client.ContainerPauseOptions) (client.ContainerPauseResult, error)
|
|
Version string
|
|
}
|
|
|
|
func (f *fakeClient) ContainerList(_ context.Context, options client.ContainerListOptions) (client.ContainerListResult, error) {
|
|
if f.containerListFunc != nil {
|
|
return f.containerListFunc(options)
|
|
}
|
|
return client.ContainerListResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerInspect(_ context.Context, containerID string, _ client.ContainerInspectOptions) (client.ContainerInspectResult, error) {
|
|
if f.inspectFunc != nil {
|
|
return f.inspectFunc(containerID)
|
|
}
|
|
return client.ContainerInspectResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ExecCreate(_ context.Context, containerID string, config client.ExecCreateOptions) (client.ExecCreateResult, error) {
|
|
if f.execCreateFunc != nil {
|
|
return f.execCreateFunc(containerID, config)
|
|
}
|
|
return client.ExecCreateResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ExecInspect(_ context.Context, execID string, _ client.ExecInspectOptions) (client.ExecInspectResult, error) {
|
|
if f.execInspectFunc != nil {
|
|
return f.execInspectFunc(execID)
|
|
}
|
|
return client.ExecInspectResult{}, nil
|
|
}
|
|
|
|
func (*fakeClient) ExecStart(context.Context, string, client.ExecStartOptions) (client.ExecStartResult, error) {
|
|
return client.ExecStartResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerCreate(_ context.Context, options client.ContainerCreateOptions) (client.ContainerCreateResult, error) {
|
|
if f.createContainerFunc != nil {
|
|
return f.createContainerFunc(options)
|
|
}
|
|
return client.ContainerCreateResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerRemove(ctx context.Context, containerID string, options client.ContainerRemoveOptions) (client.ContainerRemoveResult, error) {
|
|
if f.containerRemoveFunc != nil {
|
|
return f.containerRemoveFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerRemoveResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ImagePull(ctx context.Context, parentReference string, options client.ImagePullOptions) (client.ImagePullResponse, error) {
|
|
if f.imagePullFunc != nil {
|
|
return f.imagePullFunc(ctx, parentReference, options)
|
|
}
|
|
return fakeStreamResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) Info(context.Context, client.InfoOptions) (client.SystemInfoResult, error) {
|
|
if f.infoFunc != nil {
|
|
return f.infoFunc()
|
|
}
|
|
return client.SystemInfoResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerStatPath(_ context.Context, containerID string, options client.ContainerStatPathOptions) (client.ContainerStatPathResult, error) {
|
|
if f.containerStatPathFunc != nil {
|
|
return f.containerStatPathFunc(containerID, options.Path)
|
|
}
|
|
return client.ContainerStatPathResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) CopyFromContainer(_ context.Context, containerID string, options client.CopyFromContainerOptions) (client.CopyFromContainerResult, error) {
|
|
if f.containerCopyFromFunc != nil {
|
|
return f.containerCopyFromFunc(containerID, options.SourcePath)
|
|
}
|
|
return client.CopyFromContainerResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerLogs(_ context.Context, containerID string, options client.ContainerLogsOptions) (client.ContainerLogsResult, error) {
|
|
if f.logFunc != nil {
|
|
return f.logFunc(containerID, options)
|
|
}
|
|
return http.NoBody, nil
|
|
}
|
|
|
|
func (f *fakeClient) ClientVersion() string {
|
|
return f.Version
|
|
}
|
|
|
|
func (f *fakeClient) ContainerWait(_ context.Context, containerID string, _ client.ContainerWaitOptions) client.ContainerWaitResult {
|
|
if f.waitFunc != nil {
|
|
return f.waitFunc(containerID)
|
|
}
|
|
return client.ContainerWaitResult{}
|
|
}
|
|
|
|
func (f *fakeClient) ContainerStart(_ context.Context, containerID string, options client.ContainerStartOptions) (client.ContainerStartResult, error) {
|
|
if f.containerStartFunc != nil {
|
|
return f.containerStartFunc(containerID, options)
|
|
}
|
|
return client.ContainerStartResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerExport(_ context.Context, containerID string, _ client.ContainerExportOptions) (client.ContainerExportResult, error) {
|
|
if f.containerExportFunc != nil {
|
|
return f.containerExportFunc(containerID)
|
|
}
|
|
return http.NoBody, nil
|
|
}
|
|
|
|
func (f *fakeClient) ExecResize(_ context.Context, id string, options client.ExecResizeOptions) (client.ExecResizeResult, error) {
|
|
if f.containerExecResizeFunc != nil {
|
|
return f.containerExecResizeFunc(id, options)
|
|
}
|
|
return client.ExecResizeResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerKill(ctx context.Context, containerID string, options client.ContainerKillOptions) (client.ContainerKillResult, error) {
|
|
if f.containerKillFunc != nil {
|
|
return f.containerKillFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerKillResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerPrune(ctx context.Context, options client.ContainerPruneOptions) (client.ContainerPruneResult, error) {
|
|
if f.containerPruneFunc != nil {
|
|
return f.containerPruneFunc(ctx, options)
|
|
}
|
|
return client.ContainerPruneResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerRestart(ctx context.Context, containerID string, options client.ContainerRestartOptions) (client.ContainerRestartResult, error) {
|
|
if f.containerRestartFunc != nil {
|
|
return f.containerRestartFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerRestartResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerStop(ctx context.Context, containerID string, options client.ContainerStopOptions) (client.ContainerStopResult, error) {
|
|
if f.containerStopFunc != nil {
|
|
return f.containerStopFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerStopResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerAttach(ctx context.Context, containerID string, options client.ContainerAttachOptions) (client.ContainerAttachResult, error) {
|
|
if f.containerAttachFunc != nil {
|
|
return f.containerAttachFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerAttachResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerDiff(ctx context.Context, containerID string, _ client.ContainerDiffOptions) (client.ContainerDiffResult, error) {
|
|
if f.containerDiffFunc != nil {
|
|
return f.containerDiffFunc(ctx, containerID)
|
|
}
|
|
|
|
return client.ContainerDiffResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerRename(ctx context.Context, oldName string, options client.ContainerRenameOptions) (client.ContainerRenameResult, error) {
|
|
if f.containerRenameFunc != nil {
|
|
return client.ContainerRenameResult{}, f.containerRenameFunc(ctx, oldName, options.NewName)
|
|
}
|
|
|
|
return client.ContainerRenameResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerCommit(ctx context.Context, containerID string, options client.ContainerCommitOptions) (client.ContainerCommitResult, error) {
|
|
if f.containerCommitFunc != nil {
|
|
return f.containerCommitFunc(ctx, containerID, options)
|
|
}
|
|
return client.ContainerCommitResult{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerPause(ctx context.Context, containerID string, options client.ContainerPauseOptions) (client.ContainerPauseResult, error) {
|
|
if f.containerPauseFunc != nil {
|
|
return f.containerPauseFunc(ctx, containerID, options)
|
|
}
|
|
|
|
return client.ContainerPauseResult{}, nil
|
|
}
|
|
|
|
func (*fakeClient) Ping(_ context.Context, _ client.PingOptions) (client.PingResult, error) {
|
|
return client.PingResult{}, nil
|
|
}
|