diff --git a/src/main/java/com/spotify/docker/RemoveImageMojo.java b/src/main/java/com/spotify/docker/RemoveImageMojo.java index baf6a3f0..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,20 +51,21 @@ 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; 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 = new ArrayList<>(1); } + imageTags.add(imageNameParts[1]); for (final String imageTag : imageTags) { - final String currImageName = imageNameWithoutTag + + final String currImageName = imageNameParts[0] + ((isNullOrEmpty(imageTag)) ? "" : (":" + imageTag)); getLog().info("Removing -f " + currImageName);