Polish "Add option to create tags for a built image"

See 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

@@ -91,7 +91,7 @@ public void executedLifecycle(BuildRequest request) {
 	}
 
 	@Override
-	public void createdTag(ImageReference tag) {
+	public void taggedImage(ImageReference tag) {
 		log("Successfully created image tag '" + tag + "'");
 		log();
 	}

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

@@ -104,7 +104,7 @@ public interface BuildLog {
 	 * Log that a tag has been created.
 	 * @param tag the tag reference
 	 */
-	void createdTag(ImageReference tag);
+	void taggedImage(ImageReference tag);
 
 	/**
 	 * Factory method that returns a {@link BuildLog} the outputs to {@link System#out}.

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

@@ -111,10 +111,9 @@ public void build(BuildRequest request) throws DockerEngineException, IOExceptio
 		this.docker.image().load(ephemeralBuilder.getArchive(), UpdateListener.none());
 		try {
 			executeLifecycle(request, ephemeralBuilder);
-			createTags(request.getName(), request.getTags());
+			tagImage(request.getName(), request.getTags());
 			if (request.isPublish()) {
-				pushImage(request.getName());
-				pushTags(request.getTags());
+				pushImages(request.getName(), request.getTags());
 			}
 		}
 		finally {
@@ -153,26 +152,27 @@ private void executeLifecycle(BuildRequest request, EphemeralBuilder builder) th
 		}
 	}
 
-	private void pushImage(ImageReference reference) throws IOException {
-		Consumer<TotalProgressEvent> progressConsumer = this.log.pushingImage(reference);
-		TotalProgressPushListener listener = new TotalProgressPushListener(progressConsumer);
-		this.docker.image().push(reference, listener, getPublishAuthHeader());
-		this.log.pushedImage(reference);
-	}
-
-	private void createTags(ImageReference sourceReference, List<ImageReference> tags) throws IOException {
+	private void tagImage(ImageReference sourceReference, List<ImageReference> tags) throws IOException {
 		for (ImageReference tag : tags) {
 			this.docker.image().tag(sourceReference, tag);
-			this.log.createdTag(tag);
+			this.log.taggedImage(tag);
 		}
 	}
 
-	private void pushTags(List<ImageReference> tags) throws IOException {
+	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);
+		this.docker.image().push(reference, listener, getPublishAuthHeader());
+		this.log.pushedImage(reference);
+	}
+
 	private String getBuilderAuthHeader() {
 		return (this.dockerConfiguration != null && this.dockerConfiguration.getBuilderRegistryAuthentication() != null)
 				? this.dockerConfiguration.getBuilderRegistryAuthentication().getAuthHeader() : null;

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

@@ -284,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();
 		}
 
 		/**
@@ -305,7 +305,7 @@ public void tag(ImageReference sourceReference, ImageReference targetReference)
 			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);
+			http().post(uri).close();
 		}
 
 	}
@@ -356,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();
 		}
 
 		/**
@@ -404,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();
 		}
 
 	}
@@ -427,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/PrintStreamBuildLogTests.java

@@ -76,7 +76,7 @@ void printsExpectedOutput() throws Exception {
 		phase2Consumer.accept(mockLogEvent("spring"));
 		phase2Consumer.accept(mockLogEvent("boot"));
 		log.executedLifecycle(request);
-		log.createdTag(tag);
+		log.taggedImage(tag);
 		String expected = FileCopyUtils.copyToString(new InputStreamReader(
 				getClass().getResourceAsStream("print-stream-build-log.txt"), StandardCharsets.UTF_8));
 		assertThat(out.toString()).isEqualToIgnoringNewLines(expected);

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc

@@ -178,7 +178,7 @@ The value supplied will be passed unvalidated to Docker when creating the builde
 
 | `tags`
 |
-| Multiple {spring-boot-api}/buildpack/platform/docker/type/ImageReference.html#of-java.lang.String-[tag names] to be created for the generated image.
+| A list of one or more additional tags to apply to the generated image.
 |
 
 |===

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTagName.gradle renamed to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle

@@ -184,7 +184,7 @@ The value supplied will be passed unvalidated to Docker when creating the builde
 | `false`
 
 | `tags`
-| Multiple {spring-boot-api}/buildpack/platform/docker/type/ImageReference.html#of-java.lang.String-[tag names] to be created for the generated image.
+| One or more additional tags to apply to the generated image.
 |
 
 |===