mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0ea7b143b0
Docker 1.13 moves the `--rm` flag to the daemon, through an AutoRemove option in HostConfig. When using API 1.24 and under, AutoRemove should not be used, even if the daemon is version 1.13 or above and "supports" this feature. This patch fixes a situation where an 1.13 client, talking to an 1.13 daemon, but using the 1.24 API version, still set the AutoRemove property. As a result, both the client _and_ the daemon were attempting to remove the container, resulting in an error: ERRO[0000] error removing container: Error response from daemon: removal of container ce0976ad22495c7cbe9487752ea32721a282164862db036b2f3377bd07461c3a is already in progress In addition, the validation of conflicting options is moved from `docker run` to `opts.parse()`, so that conflicting options are also detected when running `docker create` and `docker start` separately. To resolve the issue, the `AutoRemove` option is now always set to `false` both by the client and the daemon, if API version 1.24 or under is used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
118 lines
3.7 KiB
Go
118 lines
3.7 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types/container"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
func TestContainerCreateError(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
|
|
}
|
|
_, err := client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
|
|
if err == nil || err.Error() != "Error response from daemon: Server error" {
|
|
t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %v", err)
|
|
}
|
|
|
|
// 404 doesn't automagitally means an unknown image
|
|
client = &Client{
|
|
client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
|
|
}
|
|
_, err = client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
|
|
if err == nil || err.Error() != "Error response from daemon: Server error" {
|
|
t.Fatalf("expected a Server Error while testing StatusNotFound, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestContainerCreateImageNotFound(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(errorMock(http.StatusNotFound, "No such image")),
|
|
}
|
|
_, err := client.ContainerCreate(context.Background(), &container.Config{Image: "unknown_image"}, nil, nil, "unknown")
|
|
if err == nil || !IsErrImageNotFound(err) {
|
|
t.Fatalf("expected an imageNotFound error, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestContainerCreateWithName(t *testing.T) {
|
|
expectedURL := "/containers/create"
|
|
client := &Client{
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
name := req.URL.Query().Get("name")
|
|
if name != "container_name" {
|
|
return nil, fmt.Errorf("container name not set in URL query properly. Expected `container_name`, got %s", name)
|
|
}
|
|
b, err := json.Marshal(container.ContainerCreateCreatedBody{
|
|
ID: "container_id",
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: ioutil.NopCloser(bytes.NewReader(b)),
|
|
}, nil
|
|
}),
|
|
}
|
|
|
|
r, err := client.ContainerCreate(context.Background(), nil, nil, nil, "container_name")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if r.ID != "container_id" {
|
|
t.Fatalf("expected `container_id`, got %s", r.ID)
|
|
}
|
|
}
|
|
|
|
// TestContainerCreateAutoRemove validates that a client using API 1.24 always disables AutoRemove. When using API 1.25
|
|
// or up, AutoRemove should not be disabled.
|
|
func TestContainerCreateAutoRemove(t *testing.T) {
|
|
autoRemoveValidator := func(expectedValue bool) func(req *http.Request) (*http.Response, error) {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
var config configWrapper
|
|
|
|
if err := json.NewDecoder(req.Body).Decode(&config); err != nil {
|
|
return nil, err
|
|
}
|
|
if config.HostConfig.AutoRemove != expectedValue {
|
|
return nil, fmt.Errorf("expected AutoRemove to be %v, got %v", expectedValue, config.HostConfig.AutoRemove)
|
|
}
|
|
b, err := json.Marshal(container.ContainerCreateCreatedBody{
|
|
ID: "container_id",
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: ioutil.NopCloser(bytes.NewReader(b)),
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
client := &Client{
|
|
client: newMockClient(autoRemoveValidator(false)),
|
|
version: "1.24",
|
|
}
|
|
if _, err := client.ContainerCreate(context.Background(), nil, &container.HostConfig{AutoRemove: true}, nil, ""); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
client = &Client{
|
|
client: newMockClient(autoRemoveValidator(true)),
|
|
version: "1.25",
|
|
}
|
|
if _, err := client.ContainerCreate(context.Background(), nil, &container.HostConfig{AutoRemove: true}, nil, ""); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|