31dc5c0a9a
Commit 2b17f4c8a8 fixed the way empty labels
are taken into account (i.e. not interpolated from environment variable),
but it created a regression.
`ValidateLabel` functions doesn't allow empty label value, but it has
always been possible to pass an empty label via the cli (`docker run --label foo`).
This fixes that by not validating the label flag.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
127 lines
4.4 KiB
Go
127 lines
4.4 KiB
Go
package container
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/api/types/network"
|
|
"github.com/docker/docker/client"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
type fakeClient struct {
|
|
client.Client
|
|
inspectFunc func(string) (types.ContainerJSON, error)
|
|
execInspectFunc func(execID string) (types.ContainerExecInspect, error)
|
|
execCreateFunc func(container string, config types.ExecConfig) (types.IDResponse, error)
|
|
createContainerFunc func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error)
|
|
containerStartFunc func(container string, options types.ContainerStartOptions) error
|
|
imageCreateFunc func(parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error)
|
|
infoFunc func() (types.Info, error)
|
|
containerStatPathFunc func(container, path string) (types.ContainerPathStat, error)
|
|
containerCopyFromFunc func(container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)
|
|
logFunc func(string, types.ContainerLogsOptions) (io.ReadCloser, error)
|
|
waitFunc func(string) (<-chan container.ContainerWaitOKBody, <-chan error)
|
|
containerListFunc func(types.ContainerListOptions) ([]types.Container, error)
|
|
Version string
|
|
}
|
|
|
|
func (f *fakeClient) ContainerList(_ context.Context, options types.ContainerListOptions) ([]types.Container, error) {
|
|
if f.containerListFunc != nil {
|
|
return f.containerListFunc(options)
|
|
}
|
|
return []types.Container{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerInspect(_ context.Context, containerID string) (types.ContainerJSON, error) {
|
|
if f.inspectFunc != nil {
|
|
return f.inspectFunc(containerID)
|
|
}
|
|
return types.ContainerJSON{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerExecCreate(_ context.Context, container string, config types.ExecConfig) (types.IDResponse, error) {
|
|
if f.execCreateFunc != nil {
|
|
return f.execCreateFunc(container, config)
|
|
}
|
|
return types.IDResponse{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerExecInspect(_ context.Context, execID string) (types.ContainerExecInspect, error) {
|
|
if f.execInspectFunc != nil {
|
|
return f.execInspectFunc(execID)
|
|
}
|
|
return types.ContainerExecInspect{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error {
|
|
return nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerCreate(
|
|
_ context.Context,
|
|
config *container.Config,
|
|
hostConfig *container.HostConfig,
|
|
networkingConfig *network.NetworkingConfig,
|
|
containerName string,
|
|
) (container.ContainerCreateCreatedBody, error) {
|
|
if f.createContainerFunc != nil {
|
|
return f.createContainerFunc(config, hostConfig, networkingConfig, containerName)
|
|
}
|
|
return container.ContainerCreateCreatedBody{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error) {
|
|
if f.imageCreateFunc != nil {
|
|
return f.imageCreateFunc(parentReference, options)
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (f *fakeClient) Info(_ context.Context) (types.Info, error) {
|
|
if f.infoFunc != nil {
|
|
return f.infoFunc()
|
|
}
|
|
return types.Info{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerStatPath(_ context.Context, container, path string) (types.ContainerPathStat, error) {
|
|
if f.containerStatPathFunc != nil {
|
|
return f.containerStatPathFunc(container, path)
|
|
}
|
|
return types.ContainerPathStat{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) CopyFromContainer(_ context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {
|
|
if f.containerCopyFromFunc != nil {
|
|
return f.containerCopyFromFunc(container, srcPath)
|
|
}
|
|
return nil, types.ContainerPathStat{}, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerLogs(_ context.Context, container string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
|
|
if f.logFunc != nil {
|
|
return f.logFunc(container, options)
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (f *fakeClient) ClientVersion() string {
|
|
return f.Version
|
|
}
|
|
|
|
func (f *fakeClient) ContainerWait(_ context.Context, container string, _ container.WaitCondition) (<-chan container.ContainerWaitOKBody, <-chan error) {
|
|
if f.waitFunc != nil {
|
|
return f.waitFunc(container)
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
func (f *fakeClient) ContainerStart(_ context.Context, container string, options types.ContainerStartOptions) error {
|
|
if f.containerStartFunc != nil {
|
|
return f.containerStartFunc(container, options)
|
|
}
|
|
return nil
|
|
}
|