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

Merge pull request #11932 from flouthoc/build-prune

Browse Source 
builder: Add support for builder prune
This commit is contained in:
OpenShift Merge Robot
2021-10-12 19:32:10 +02:00
committed by GitHub
parent 2905bc351b ab8fb3876d
commit 214c13da0a
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/podman/images/buildx.go
View File

@ -15,6 +15,7 @@ var (
// to podman build. // to podman build.
buildxCmd = &cobra.Command{ buildxCmd = &cobra.Command{
Use: "buildx", Use: "buildx",
Aliases: []string{"builder"},
Short: "Build images", Short: "Build images",
Long: "Build images", Long: "Build images",
RunE: validate.SubCommandExists, RunE: validate.SubCommandExists,

5
cmd/podman/images/prune.go
View File

@ -34,6 +34,11 @@ var (
) )
func init() { func init() {
registry.Commands = append(registry.Commands, registry.CliCommand{
Command: pruneCmd,
Parent: buildxCmd,
})
registry.Commands = append(registry.Commands, registry.CliCommand{ registry.Commands = append(registry.Commands, registry.CliCommand{
Command: pruneCmd, Command: pruneCmd,
Parent: imageCmd, Parent: imageCmd,

21
test/e2e/images_test.go
View File

@ -446,4 +446,25 @@ RUN > file2
}) })
It("podman builder prune", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest
RUN > file
`
dockerfile2 := `FROM quay.io/libpod/alpine:latest
RUN > file2
`
podmanTest.BuildImageWithLabel(dockerfile, "foobar.com/workdir:latest", "false", "abc")
podmanTest.BuildImageWithLabel(dockerfile2, "foobar.com/workdir:latest", "false", "xyz")
// --force used to to avoid y/n question
result := podmanTest.Podman([]string{"builder", "prune", "--filter", "label=abc", "--force"})
result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0))
Expect(len(result.OutputToStringArray())).To(Equal(1))
//check if really abc is removed
result = podmanTest.Podman([]string{"image", "list", "--filter", "label=abc"})
Expect(len(result.OutputToStringArray())).To(Equal(0))
})
}) })