From 96238ba8b761d77e7e31ec5f9850c90aa9cb0616 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 16 Sep 2021 15:51:12 -0500 Subject: [PATCH] Expose default value for imageName in bootBuildImage task Fixes gh-28040 --- .../boot/gradle/tasks/bundling/BootBuildImage.java | 2 +- .../boot/gradle/tasks/bundling/BootBuildImageTests.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java index 831987fa72..23f9f57953 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java @@ -148,7 +148,7 @@ public class BootBuildImage extends DefaultTask { @Input @Optional public String getImageName() { - return this.imageName; + return determineImageReference().toString(); } /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java index 082a2b5954..6b54503892 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java @@ -63,6 +63,7 @@ class BootBuildImageTests { @Test void whenProjectVersionIsUnspecifiedThenItIsIgnoredWhenDerivingImageName() { + assertThat(this.buildImage.getImageName()).isEqualTo("docker.io/library/build-image-test"); BuildRequest request = this.buildImage.createRequest(); assertThat(request.getName().getDomain()).isEqualTo("docker.io"); assertThat(request.getName().getName()).isEqualTo("library/build-image-test"); @@ -73,6 +74,7 @@ class BootBuildImageTests { @Test void whenProjectVersionIsSpecifiedThenItIsUsedInTagOfImageName() { this.project.setVersion("1.2.3"); + assertThat(this.buildImage.getImageName()).isEqualTo("docker.io/library/build-image-test:1.2.3"); BuildRequest request = this.buildImage.createRequest(); assertThat(request.getName().getDomain()).isEqualTo("docker.io"); assertThat(request.getName().getName()).isEqualTo("library/build-image-test"); @@ -84,6 +86,7 @@ class BootBuildImageTests { void whenImageNameIsSpecifiedThenItIsUsedInRequest() { this.project.setVersion("1.2.3"); this.buildImage.setImageName("example.com/test/build-image:1.0"); + assertThat(this.buildImage.getImageName()).isEqualTo("example.com/test/build-image:1.0"); BuildRequest request = this.buildImage.createRequest(); assertThat(request.getName().getDomain()).isEqualTo("example.com"); assertThat(request.getName().getName()).isEqualTo("test/build-image");