adding ignore checks for prune and rmi
This commit is contained in:
parent
1f0cfcc3ef
commit
9701f08184
15
docker.go
15
docker.go
@ -135,6 +135,10 @@ func (p Plugin) Exec() error {
|
|||||||
err := cmd.Run()
|
err := cmd.Run()
|
||||||
if err != nil && isCommandPull(cmd.Args) {
|
if err != nil && isCommandPull(cmd.Args) {
|
||||||
fmt.Printf("Could not pull cache-from image %s. Ignoring...\n", cmd.Args[2])
|
fmt.Printf("Could not pull cache-from image %s. Ignoring...\n", cmd.Args[2])
|
||||||
|
} else if err != nil && isCommandPrune(cmd.Args) {
|
||||||
|
fmt.Printf("Could not prune system containers. Ignoring...\n")
|
||||||
|
} else if err != nil && isCommandRmi(cmd.Args) {
|
||||||
|
fmt.Printf("Could not remove image %s. Ignoring...\n", cmd.Args[2])
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -341,10 +345,21 @@ func commandDaemon(daemon Daemon) *exec.Cmd {
|
|||||||
return exec.Command(dockerdExe, args...)
|
return exec.Command(dockerdExe, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// helper to check if args match "docker prune"
|
||||||
|
func isCommandPrune(args []string) bool {
|
||||||
|
return len(args) > 2 && args[1] == "prune"
|
||||||
|
}
|
||||||
|
|
||||||
func commandPrune() *exec.Cmd {
|
func commandPrune() *exec.Cmd {
|
||||||
return exec.Command(dockerExe, "system", "prune", "-f")
|
return exec.Command(dockerExe, "system", "prune", "-f")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// helper to check if args match "docker rmi"
|
||||||
|
func isCommandRmi(args []string) bool {
|
||||||
|
return len(args) > 2 && args[1] == "rmi"
|
||||||
|
}
|
||||||
|
|
||||||
func commandRmi(tag string) *exec.Cmd {
|
func commandRmi(tag string) *exec.Cmd {
|
||||||
return exec.Command(dockerExe, "rmi", tag)
|
return exec.Command(dockerExe, "rmi", tag)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user