container: properly handle 404s on container creation

Fix fsouza#528.
imkos · Jan 16, 2019 · 07f7952 · 07f7952
1 parent d574e25
commit 07f7952
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/container.go b/container.go
@@ -627,7 +627,7 @@ func (c *Client) CreateContainer(opts CreateContainerOptions) (*Container, error
 	)
 
 	if e, ok := err.(*Error); ok {
-		if e.Status == http.StatusNotFound {
+		if e.Status == http.StatusNotFound && strings.Contains(e.Message, "No such image") {
 			return nil, ErrNoSuchImage
 		}
 		if e.Status == http.StatusConflict {

diff --git a/container_test.go b/container_test.go
@@ -915,7 +915,7 @@ func TestCreateContainer(t *testing.T) {
 
 func TestCreateContainerImageNotFound(t *testing.T) {
 	t.Parallel()
-	client := newTestClient(&FakeRoundTripper{message: "No such image", status: http.StatusNotFound})
+	client := newTestClient(&FakeRoundTripper{message: "No such image: whatever", status: http.StatusNotFound})
 	config := Config{AttachStdout: true, AttachStdin: true}
 	container, err := client.CreateContainer(CreateContainerOptions{Config: &config})
 	if container != nil {