From fd0c2ab6e13980f87c4c8d95442aeacf562c7b7f Mon Sep 17 00:00:00 2001 From: Grzegorz Gidel Date: Thu, 28 Apr 2016 09:08:53 +0200 Subject: [PATCH 1/3] Default to the image tag from the image name in docker:removeImage instead of :latest --- src/main/java/com/spotify/docker/RemoveImageMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/spotify/docker/RemoveImageMojo.java b/src/main/java/com/spotify/docker/RemoveImageMojo.java index baf6a3f0..a47c4d2d 100644 --- a/src/main/java/com/spotify/docker/RemoveImageMojo.java +++ b/src/main/java/com/spotify/docker/RemoveImageMojo.java @@ -58,13 +58,13 @@ public class RemoveImageMojo extends AbstractDockerMojo { protected void execute(final DockerClient docker) throws MojoExecutionException, DockerException, IOException, InterruptedException { - final String imageNameWithoutTag = parseImageName(imageName)[0]; + final String[] imageNameParts = parseImageName(imageName); if (imageTags == null) { - imageTags = Collections.singletonList(""); + imageTags = Collections.singletonList(imageNameParts[1]); } for (final String imageTag : imageTags) { - final String currImageName = imageNameWithoutTag + + final String currImageName = imageNameParts[0] + ((isNullOrEmpty(imageTag)) ? "" : (":" + imageTag)); getLog().info("Removing -f " + currImageName); From a78b470b1f92e9281b36734e86c1f0cbe2419286 Mon Sep 17 00:00:00 2001 From: Grzegorz Gidel Date: Thu, 28 Apr 2016 09:11:32 +0200 Subject: [PATCH 2/3] Use the image tag from the image name in docker:removeImage when imageTags is empty instead of taking no action --- src/main/java/com/spotify/docker/RemoveImageMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/spotify/docker/RemoveImageMojo.java b/src/main/java/com/spotify/docker/RemoveImageMojo.java index a47c4d2d..988e7064 100644 --- a/src/main/java/com/spotify/docker/RemoveImageMojo.java +++ b/src/main/java/com/spotify/docker/RemoveImageMojo.java @@ -59,7 +59,7 @@ public class RemoveImageMojo extends AbstractDockerMojo { protected void execute(final DockerClient docker) throws MojoExecutionException, DockerException, IOException, InterruptedException { final String[] imageNameParts = parseImageName(imageName); - if (imageTags == null) { + if (imageTags == null || imageTags.isEmpty()) { imageTags = Collections.singletonList(imageNameParts[1]); } From fdbaaba59ceb98173d9adb95606b63f8f918c32d Mon Sep 17 00:00:00 2001 From: Grzegorz Gidel Date: Thu, 28 Apr 2016 09:14:36 +0200 Subject: [PATCH 3/3] Treat imageTags in docker:removeImage as additional tags instead of replacement for the one in the image name --- src/main/java/com/spotify/docker/RemoveImageMojo.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/spotify/docker/RemoveImageMojo.java b/src/main/java/com/spotify/docker/RemoveImageMojo.java index 988e7064..0e44fc82 100644 --- a/src/main/java/com/spotify/docker/RemoveImageMojo.java +++ b/src/main/java/com/spotify/docker/RemoveImageMojo.java @@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotations.Parameter; import java.io.IOException; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import static com.google.common.base.Strings.isNullOrEmpty; @@ -51,7 +51,7 @@ public class RemoveImageMojo extends AbstractDockerMojo { private String imageName; /** - * Additional tags to tag the image with. + * Additional tags to remove. */ @Parameter(property = "dockerImageTags") private List imageTags; @@ -59,9 +59,10 @@ public class RemoveImageMojo extends AbstractDockerMojo { protected void execute(final DockerClient docker) throws MojoExecutionException, DockerException, IOException, InterruptedException { final String[] imageNameParts = parseImageName(imageName); - if (imageTags == null || imageTags.isEmpty()) { - imageTags = Collections.singletonList(imageNameParts[1]); + if (imageTags == null) { + imageTags = new ArrayList<>(1); } + imageTags.add(imageNameParts[1]); for (final String imageTag : imageTags) { final String currImageName = imageNameParts[0] +