starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28535 from yongtang/28497-prune-until

Browse Source 
Convert DanglingOnly to Filters for `docker image prune`
Upstream-commit: 652b457a60
Component: cli
This commit is contained in:
Vincent Demeester
2016-12-06 11:03:45 +01:00
committed by GitHub
parent 8986c729f3 b4cfb614da
commit a8055ae651
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/cli/command/container/prune.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
units "github.com/docker/go-units" units "github.com/docker/go-units"
@@ -52,7 +52,7 @@ func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed u
return return
} }
report, err := dockerCli.Client().ContainersPrune(context.Background(), types.ContainersPruneConfig{}) report, err := dockerCli.Client().ContainersPrune(context.Background(), filters.Args{})
if err != nil { if err != nil {
return return
} }
components/cli/command/image/prune.go
+5 -4
View File
@@ -5,7 +5,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
units "github.com/docker/go-units" units "github.com/docker/go-units"
@@ -54,6 +54,9 @@ Are you sure you want to continue?`
) )
func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed uint64, output string, err error) { func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed uint64, output string, err error) {
pruneFilters := filters.NewArgs()
pruneFilters.Add("dangling", fmt.Sprintf("%v", !opts.all))
warning := danglingWarning warning := danglingWarning
if opts.all { if opts.all {
warning = allImageWarning warning = allImageWarning
@@ -62,9 +65,7 @@ func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed u
return return
} }
report, err := dockerCli.Client().ImagesPrune(context.Background(), types.ImagesPruneConfig{ report, err := dockerCli.Client().ImagesPrune(context.Background(), pruneFilters)
DanglingOnly: !opts.all,
})
if err != nil { if err != nil {
return return
} }
components/cli/command/network/prune.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@@ -50,7 +50,7 @@ func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (output string, e
return return
} }
report, err := dockerCli.Client().NetworksPrune(context.Background(), types.NetworksPruneConfig{}) report, err := dockerCli.Client().NetworksPrune(context.Background(), filters.Args{})
if err != nil { if err != nil {
return return
} }
components/cli/command/volume/prune.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
units "github.com/docker/go-units" units "github.com/docker/go-units"
@@ -52,7 +52,7 @@ func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed u
return return
} }
report, err := dockerCli.Client().VolumesPrune(context.Background(), types.VolumesPruneConfig{}) report, err := dockerCli.Client().VolumesPrune(context.Background(), filters.Args{})
if err != nil { if err != nil {
return return
} }