From e6bd4e0c3615b5fadfe5e742e260ad4714f68daa Mon Sep 17 00:00:00 2001 From: "sejun.bae" Date: Fri, 29 Sep 2023 10:19:07 -0700 Subject: [PATCH 1/2] Don't run `prune` during cleanup since it can lead to parallel builds failing. --- docker.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker.go b/docker.go index 210f6dfd..9a6aef21 100644 --- a/docker.go +++ b/docker.go @@ -244,13 +244,22 @@ func (p Plugin) Exec() error { // clear the slice cmds = nil + // Remove all images that were created. cmds = append(cmds, commandRmi(p.Build.TempTag)) // docker rmi - cmds = append(cmds, commandPrune()) // docker system prune -f + for _, tag := range p.Build.Tags { + cmds = append(cmds, commandRmi(tag)) // docker rmi + } for _, cmd := range cmds { cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr trace(cmd) + + err := cmd.Run() + + if err != nil { + fmt.Printf("Could not remove image %s. Ignoring...\n", cmd.Args[2]) + } } } From f3dcd49175b1e7b25ec7d1febe6a3331bbd9e1f4 Mon Sep 17 00:00:00 2001 From: "sejun.bae" Date: Fri, 29 Sep 2023 17:20:41 -0700 Subject: [PATCH 2/2] imageName is Repo + tag name. --- docker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker.go b/docker.go index 9a6aef21..0d610321 100644 --- a/docker.go +++ b/docker.go @@ -247,7 +247,8 @@ func (p Plugin) Exec() error { // Remove all images that were created. cmds = append(cmds, commandRmi(p.Build.TempTag)) // docker rmi for _, tag := range p.Build.Tags { - cmds = append(cmds, commandRmi(tag)) // docker rmi + imageName := fmt.Sprintf("%s:%s", p.Build.Repo, tag) + cmds = append(cmds, commandRmi(imageName)) // docker rmi } for _, cmd := range cmds {