Merge pull request #27613 from ceccone

* pr/27613:
  Polish "Add option to create tags for a built image"
  Add option to create tags for a built image

Closes gh-27613

Author: scottfrederick

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/AbstractBuildLog.java

@@ -31,6 +31,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Andrey Shlykov
+ * @author Rafael Ceccone
  * @since 2.3.0
  */
 public abstract class AbstractBuildLog implements BuildLog {
@@ -89,6 +90,12 @@ public void executedLifecycle(BuildRequest request) {
 		log();
 	}
 
+	@Override
+	public void taggedImage(ImageReference tag) {
+		log("Successfully created image tag '" + tag + "'");
+		log();
+	}
+
 	private String getDigest(Image image) {
 		List<String> digests = image.getDigests();
 		return (digests.isEmpty() ? "" : digests.get(0));

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java

@@ -31,6 +31,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Andrey Shlykov
+ * @author Rafael Ceccone
  * @since 2.3.0
  * @see #toSystemOut()
  */
@@ -99,6 +100,12 @@ public interface BuildLog {
 	 */
 	void executedLifecycle(BuildRequest request);
 
+	/**
+	 * Log that a tag has been created.
+	 * @param tag the tag reference
+	 */
+	void taggedImage(ImageReference tag);
+
 	/**
 	 * Factory method that returns a {@link BuildLog} the outputs to {@link System#out}.
 	 * @return a build log instance that logs to system out

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java

@@ -37,6 +37,7 @@
  * @author Scott Frederick
  * @author Andrey Shlykov
  * @author Jeroen Meijer
+ * @author Rafael Ceccone
  * @since 2.3.0
  */
 public class BuildRequest {
@@ -71,6 +72,8 @@ public class BuildRequest {
 
 	private final String network;
 
+	private final List<ImageReference> tags;
+
 	BuildRequest(ImageReference name, Function<Owner, TarArchive> applicationContent) {
 		Assert.notNull(name, "Name must not be null");
 		Assert.notNull(applicationContent, "ApplicationContent must not be null");
@@ -87,12 +90,13 @@ public class BuildRequest {
 		this.buildpacks = Collections.emptyList();
 		this.bindings = Collections.emptyList();
 		this.network = null;
+		this.tags = Collections.emptyList();
 	}
 
 	BuildRequest(ImageReference name, Function<Owner, TarArchive> applicationContent, ImageReference builder,
 			ImageReference runImage, Creator creator, Map<String, String> env, boolean cleanCache,
 			boolean verboseLogging, PullPolicy pullPolicy, boolean publish, List<BuildpackReference> buildpacks,
-			List<Binding> bindings, String network) {
+			List<Binding> bindings, String network, List<ImageReference> tags) {
 		this.name = name;
 		this.applicationContent = applicationContent;
 		this.builder = builder;
@@ -106,6 +110,7 @@ public class BuildRequest {
 		this.buildpacks = buildpacks;
 		this.bindings = bindings;
 		this.network = network;
+		this.tags = tags;
 	}
 
 	/**
@@ -117,7 +122,7 @@ public BuildRequest withBuilder(ImageReference builder) {
 		Assert.notNull(builder, "Builder must not be null");
 		return new BuildRequest(this.name, this.applicationContent, builder.inTaggedOrDigestForm(), this.runImage,
 				this.creator, this.env, this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network);
+				this.buildpacks, this.bindings, this.network, this.tags);
 	}
 
 	/**
@@ -128,7 +133,7 @@ public BuildRequest withBuilder(ImageReference builder) {
 	public BuildRequest withRunImage(ImageReference runImageName) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, runImageName.inTaggedOrDigestForm(),
 				this.creator, this.env, this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network);
+				this.buildpacks, this.bindings, this.network, this.tags);
 	}
 
 	/**
@@ -140,7 +145,7 @@ public BuildRequest withCreator(Creator creator) {
 		Assert.notNull(creator, "Creator must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -156,7 +161,7 @@ public BuildRequest withEnv(String name, String value) {
 		env.put(name, value);
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator,
 				Collections.unmodifiableMap(env), this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish,
-				this.buildpacks, this.bindings, this.network);
+				this.buildpacks, this.bindings, this.network, this.tags);
 	}
 
 	/**
@@ -170,7 +175,7 @@ public BuildRequest withEnv(Map<String, String> env) {
 		updatedEnv.putAll(env);
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator,
 				Collections.unmodifiableMap(updatedEnv), this.cleanCache, this.verboseLogging, this.pullPolicy,
-				this.publish, this.buildpacks, this.bindings, this.network);
+				this.publish, this.buildpacks, this.bindings, this.network, this.tags);
 	}
 
 	/**
@@ -181,7 +186,7 @@ public BuildRequest withEnv(Map<String, String> env) {
 	public BuildRequest withCleanCache(boolean cleanCache) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -192,7 +197,7 @@ public BuildRequest withCleanCache(boolean cleanCache) {
 	public BuildRequest withVerboseLogging(boolean verboseLogging) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -203,7 +208,7 @@ public BuildRequest withVerboseLogging(boolean verboseLogging) {
 	public BuildRequest withPullPolicy(PullPolicy pullPolicy) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, pullPolicy, this.publish, this.buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -214,7 +219,7 @@ public BuildRequest withPullPolicy(PullPolicy pullPolicy) {
 	public BuildRequest withPublish(boolean publish) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, publish, this.buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -238,7 +243,7 @@ public BuildRequest withBuildpacks(List<BuildpackReference> buildpacks) {
 		Assert.notNull(buildpacks, "Buildpacks must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, buildpacks, this.bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -262,7 +267,7 @@ public BuildRequest withBindings(List<Binding> bindings) {
 		Assert.notNull(bindings, "Bindings must not be null");
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, bindings,
-				this.network);
+				this.network, this.tags);
 	}
 
 	/**
@@ -274,7 +279,29 @@ public BuildRequest withBindings(List<Binding> bindings) {
 	public BuildRequest withNetwork(String network) {
 		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
 				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
-				network);
+				network, this.tags);
+	}
+
+	/**
+	 * Return a new {@link BuildRequest} with updated tags.
+	 * @param tags a collection of tags to be created for the built image
+	 * @return an updated build request
+	 */
+	public BuildRequest withTags(ImageReference... tags) {
+		Assert.notEmpty(tags, "Tags must not be empty");
+		return withTags(Arrays.asList(tags));
+	}
+
+	/**
+	 * Return a new {@link BuildRequest} with updated tags.
+	 * @param tags a collection of tags to be created for the built image
+	 * @return an updated build request
+	 */
+	public BuildRequest withTags(List<ImageReference> tags) {
+		Assert.notNull(tags, "Tags must not be null");
+		return new BuildRequest(this.name, this.applicationContent, this.builder, this.runImage, this.creator, this.env,
+				this.cleanCache, this.verboseLogging, this.pullPolicy, this.publish, this.buildpacks, this.bindings,
+				this.network, tags);
 	}
 
 	/**
@@ -386,6 +413,14 @@ public String getNetwork() {
 		return this.network;
 	}
 
+	/**
+	 * Return the collection of tags that should be created.
+	 * @return the tags
+	 */
+	public List<ImageReference> getTags() {
+		return this.tags;
+	}
+
 	/**
 	 * Factory method to create a new {@link BuildRequest} from a JAR file.
 	 * @param jarFile the source jar file

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java

@@ -41,6 +41,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Andrey Shlykov
+ * @author Rafael Ceccone
  * @since 2.3.0
  */
 public class Builder {
@@ -110,8 +111,9 @@ public void build(BuildRequest request) throws DockerEngineException, IOExceptio
 		this.docker.image().load(ephemeralBuilder.getArchive(), UpdateListener.none());
 		try {
 			executeLifecycle(request, ephemeralBuilder);
+			tagImage(request.getName(), request.getTags());
 			if (request.isPublish()) {
-				pushImage(request.getName());
+				pushImages(request.getName(), request.getTags());
 			}
 		}
 		finally {
@@ -150,6 +152,20 @@ private void executeLifecycle(BuildRequest request, EphemeralBuilder builder) th
 		}
 	}
 
+	private void tagImage(ImageReference sourceReference, List<ImageReference> tags) throws IOException {
+		for (ImageReference tag : tags) {
+			this.docker.image().tag(sourceReference, tag);
+			this.log.taggedImage(tag);
+		}
+	}
+
+	private void pushImages(ImageReference name, List<ImageReference> tags) throws IOException {
+		pushImage(name);
+		for (ImageReference tag : tags) {
+			pushImage(tag);
+		}
+	}
+
 	private void pushImage(ImageReference reference) throws IOException {
 		Consumer<TotalProgressEvent> progressConsumer = this.log.pushingImage(reference);
 		TotalProgressPushListener listener = new TotalProgressPushListener(progressConsumer);

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java

@@ -52,6 +52,7 @@
  *
  * @author Phillip Webb
  * @author Scott Frederick
+ * @author Rafael Ceccone
  * @since 2.3.0
  */
 public class DockerApi {
@@ -283,7 +284,7 @@ public void remove(ImageReference reference, boolean force) throws IOException {
 			Assert.notNull(reference, "Reference must not be null");
 			Collection<String> params = force ? FORCE_PARAMS : Collections.emptySet();
 			URI uri = buildUrl("/images/" + reference, params);
-			http().delete(uri);
+			http().delete(uri).close();
 		}
 
 		/**
@@ -300,6 +301,13 @@ public Image inspect(ImageReference reference) throws IOException {
 			}
 		}
 
+		public void tag(ImageReference sourceReference, ImageReference targetReference) throws IOException {
+			Assert.notNull(sourceReference, "SourceReference must not be null");
+			Assert.notNull(targetReference, "TargetReference must not be null");
+			URI uri = buildUrl("/images/" + sourceReference + "/tag", "repo", targetReference.toString());
+			http().post(uri).close();
+		}
+
 	}
 
 	/**
@@ -348,7 +356,7 @@ private void uploadContainerContent(ContainerReference reference, ContainerConte
 		public void start(ContainerReference reference) throws IOException {
 			Assert.notNull(reference, "Reference must not be null");
 			URI uri = buildUrl("/containers/" + reference + "/start");
-			http().post(uri);
+			http().post(uri).close();
 		}
 
 		/**
@@ -396,7 +404,7 @@ public void remove(ContainerReference reference, boolean force) throws IOExcepti
 			Assert.notNull(reference, "Reference must not be null");
 			Collection<String> params = force ? FORCE_PARAMS : Collections.emptySet();
 			URI uri = buildUrl("/containers/" + reference, params);
-			http().delete(uri);
+			http().delete(uri).close();
 		}
 
 	}
@@ -419,7 +427,7 @@ public void delete(VolumeName name, boolean force) throws IOException {
 			Assert.notNull(name, "Name must not be null");
 			Collection<String> params = force ? FORCE_PARAMS : Collections.emptySet();
 			URI uri = buildUrl("/volumes/" + name, params);
-			http().delete(uri);
+			http().delete(uri).close();
 		}
 
 	}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java

@@ -46,6 +46,7 @@
  * @author Phillip Webb
  * @author Scott Frederick
  * @author Jeroen Meijer
+ * @author Rafael Ceccone
  */
 class BuildRequestTests {
 
@@ -206,6 +207,25 @@ void withNetworkUpdatesNetwork() throws IOException {
 		assertThat(request.getNetwork()).isEqualTo("test");
 	}
 
+	@Test
+	void withTagsAddsTags() throws IOException {
+		BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar"));
+		BuildRequest witTags = request.withTags(ImageReference.of("docker.io/library/my-app:latest"),
+				ImageReference.of("example.com/custom/my-app:0.0.1"),
+				ImageReference.of("example.com/custom/my-app:latest"));
+		assertThat(request.getTags()).isEmpty();
+		assertThat(witTags.getTags()).containsExactly(ImageReference.of("docker.io/library/my-app:latest"),
+				ImageReference.of("example.com/custom/my-app:0.0.1"),
+				ImageReference.of("example.com/custom/my-app:latest"));
+	}
+
+	@Test
+	void withTagsWhenTagsIsNullThrowsException() throws IOException {
+		BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar"));
+		assertThatIllegalArgumentException().isThrownBy(() -> request.withTags((List<ImageReference>) null))
+				.withMessage("Tags must not be null");
+	}
+
 	private void hasExpectedJarContent(TarArchive archive) {
 		try {
 			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();