Skip to content

fixes #46 Always exit 0 when remove image with force option #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vdemeester merged 1 commit into from
Jun 13, 2017
Merged

fixes #46 Always exit 0 when remove image with force option #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cli/command/image/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,12 @@ func runRemove(dockerCli command.Cli, opts removeOptions, images []string) error
}

var errs []string
for _, image := range images {
dels, err := client.ImageRemove(ctx, image, options)
for _, img := range images {
dels, err := client.ImageRemove(ctx, img, options)
if err != nil {
if opts.force {
fmt.Fprintf(dockerCli.Out(), "NotFound: %s\n", img)
}
errs = append(errs, err.Error())
} else {
for _, del := range dels {
Expand All @@ -71,7 +74,7 @@ func runRemove(dockerCli command.Cli, opts removeOptions, images []string) error
}
}

if len(errs) > 0 {
if !opts.force && len(errs) > 0 {
return errors.Errorf("%s", strings.Join(errs, "\n"))
}
return nil
Expand Down
8 changes: 8 additions & 0 deletions cli/command/image/remove_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ func TestNewRemoveCommandSuccess(t *testing.T) {
return []types.ImageDeleteResponseItem{{Deleted: image}}, nil
},
},
{
name: "Image Deleted with force option",
args: []string{"-f", "image1"},
imageRemoveFunc: func(image string, options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
assert.Equal(t, "image1", image)
return []types.ImageDeleteResponseItem{}, errors.Errorf("error removing image")
},
},
{
name: "Image Untagged",
args: []string{"image1"},
Expand Down
2 changes: 2 additions & 0 deletions cli/command/image/testdata/remove-command-success.Image Deleted with force option.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NotFound:image1
Copy link
Member

@thaJeztah thaJeztah Jun 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was discussing with @vdemeester that the naming of these files is a bit odd; perhaps we should normalise them to be lowercase and have spaces replaced with -. Given that these files are generated, and this is in line with other files in this tests, we can keep it for now 👍

NotFound:image1