mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4921171587
This patch adds the untilRemoved option to the ContainerWait API which allows the client to wait until the container is not only exited but also removed. This patch also adds some more CLI integration tests for waiting for a created container and waiting with the new --until-removed flag. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Handle detach sequence in CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Update Container Wait Conditions Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Apply container wait changes to API 1.30 The set of changes to the containerWait API missed the cut for the Docker 17.05 release (API version 1.29). This patch bumps the version checks to use 1.30 instead. This patch also makes a minor update to a testfile which was added to the builder/dockerfile package. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Remove wait changes from CLI Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address minor nits on wait changes - Changed the name of the tty Proxy wrapper to `escapeProxy` - Removed the unnecessary Error() method on container.State - Fixes a typo in comment (repeated word) Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Use router.WithCancel in the containerWait handler This handler previously added this functionality manually but now uses the existing wrapper which does it for us. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Add WaitCondition constants to api/types/container Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address more ContainerWait review comments - Update ContainerWait backend interface to not return pointer values for container.StateStatus type. - Updated container state's Wait() method comments to clarify that a context MUST be used for cancelling the request, setting timeouts, and to avoid goroutine leaks. - Removed unnecessary buffering when making channels in the client's ContainerWait methods. - Renamed result and error channels in client's ContainerWait methods to clarify that only a single result or error value would be sent on the channel. Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Move container.WaitCondition type to separate file ... to avoid conflict with swagger-generated code for API response Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) Address more ContainerWait review comments Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
109 lines
3 KiB
Go
109 lines
3 KiB
Go
package dockerfile
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/docker/distribution/reference"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/backend"
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/builder"
|
|
containerpkg "github.com/docker/docker/container"
|
|
"github.com/docker/docker/image"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// MockBackend implements the builder.Backend interface for unit testing
|
|
type MockBackend struct {
|
|
containerCreateFunc func(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)
|
|
commitFunc func(string, *backend.ContainerCommitConfig) (string, error)
|
|
getImageFunc func(string) (builder.Image, builder.ReleaseableLayer, error)
|
|
}
|
|
|
|
func (m *MockBackend) TagImageWithReference(image.ID, reference.Named) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerAttachRaw(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool, attached chan struct{}) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerCreate(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error) {
|
|
if m.containerCreateFunc != nil {
|
|
return m.containerCreateFunc(config)
|
|
}
|
|
return container.ContainerCreateCreatedBody{}, nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerRm(name string, config *types.ContainerRmConfig) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) Commit(cID string, cfg *backend.ContainerCommitConfig) (string, error) {
|
|
if m.commitFunc != nil {
|
|
return m.commitFunc(cID, cfg)
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerKill(containerID string, sig uint64) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerStart(containerID string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerWait(ctx context.Context, containerID string, condition containerpkg.WaitCondition) (<-chan containerpkg.StateStatus, error) {
|
|
return nil, nil
|
|
}
|
|
|
|
func (m *MockBackend) ContainerCreateWorkdir(containerID string) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) CopyOnBuild(containerID string, destPath string, srcRoot string, srcPath string, decompress bool) error {
|
|
return nil
|
|
}
|
|
|
|
func (m *MockBackend) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ReleaseableLayer, error) {
|
|
if m.getImageFunc != nil {
|
|
return m.getImageFunc(refOrID)
|
|
}
|
|
|
|
return &mockImage{id: "theid"}, &mockLayer{}, nil
|
|
}
|
|
|
|
type mockImage struct {
|
|
id string
|
|
config *container.Config
|
|
}
|
|
|
|
func (i *mockImage) ImageID() string {
|
|
return i.id
|
|
}
|
|
|
|
func (i *mockImage) RunConfig() *container.Config {
|
|
return i.config
|
|
}
|
|
|
|
type mockImageCache struct {
|
|
getCacheFunc func(parentID string, cfg *container.Config) (string, error)
|
|
}
|
|
|
|
func (mic *mockImageCache) GetCache(parentID string, cfg *container.Config) (string, error) {
|
|
if mic.getCacheFunc != nil {
|
|
return mic.getCacheFunc(parentID, cfg)
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
type mockLayer struct{}
|
|
|
|
func (l *mockLayer) Release() error {
|
|
return nil
|
|
}
|
|
|
|
func (l *mockLayer) Mount() (string, error) {
|
|
return "mountPath", nil
|
|
}
|