opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20481 from vrothberg/fix-20469

Browse Source 
compat API: fix image-prune --all
This commit is contained in:
openshift-ci[bot]
2023-10-25 11:29:30 +00:00
committed by GitHub
parent 532804be54 c13b8e3c9c
commit 556898511c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/domain/infra/abi/images.go
View File

@ -56,8 +56,19 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption
} }
if !opts.All { if !opts.All {
// Issue #20469: Docker clients handle the --all flag on the
// client side by setting the dangling filter directly.
alreadySet := false
for _, filter := range pruneOptions.Filters {
if strings.HasPrefix(filter, "dangling=") {
alreadySet = true
break
}
}
if !alreadySet {
pruneOptions.Filters = append(pruneOptions.Filters, "dangling=true") pruneOptions.Filters = append(pruneOptions.Filters, "dangling=true")
} }
}
if opts.External { if opts.External {
pruneOptions.Filters = append(pruneOptions.Filters, "containers=external") pruneOptions.Filters = append(pruneOptions.Filters, "containers=external")
} else { } else {

2
test/apiv2/10-images.at
View File

@ -164,6 +164,8 @@ t DELETE libpod/images/test:test 200
t GET images/json?filters='{"label":["xyz"]}' 200 length=0 t GET images/json?filters='{"label":["xyz"]}' 200 length=0
t GET libpod/images/json?filters='{"label":["xyz"]}' 200 length=0 t GET libpod/images/json?filters='{"label":["xyz"]}' 200 length=0
# Must not error out: #20469
t POST images/prune?filters='{"dangling":["false"]}' 200
# to be used in prune until filter tests # to be used in prune until filter tests
podman image build -t test1:latest -<<EOF podman image build -t test1:latest -<<EOF