Expose default value for imageName in bootBuildImage task

Fixes gh-28040
pull/28064/head
Scott Frederick 3 years ago
parent 1612c5955d
commit 96238ba8b7

@ -148,7 +148,7 @@ public class BootBuildImage extends DefaultTask {
@Input @Input
@Optional @Optional
public String getImageName() { public String getImageName() {
return this.imageName; return determineImageReference().toString();
} }
/** /**

@ -63,6 +63,7 @@ class BootBuildImageTests {
@Test @Test
void whenProjectVersionIsUnspecifiedThenItIsIgnoredWhenDerivingImageName() { void whenProjectVersionIsUnspecifiedThenItIsIgnoredWhenDerivingImageName() {
assertThat(this.buildImage.getImageName()).isEqualTo("docker.io/library/build-image-test");
BuildRequest request = this.buildImage.createRequest(); BuildRequest request = this.buildImage.createRequest();
assertThat(request.getName().getDomain()).isEqualTo("docker.io"); assertThat(request.getName().getDomain()).isEqualTo("docker.io");
assertThat(request.getName().getName()).isEqualTo("library/build-image-test"); assertThat(request.getName().getName()).isEqualTo("library/build-image-test");
@ -73,6 +74,7 @@ class BootBuildImageTests {
@Test @Test
void whenProjectVersionIsSpecifiedThenItIsUsedInTagOfImageName() { void whenProjectVersionIsSpecifiedThenItIsUsedInTagOfImageName() {
this.project.setVersion("1.2.3"); 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(); BuildRequest request = this.buildImage.createRequest();
assertThat(request.getName().getDomain()).isEqualTo("docker.io"); assertThat(request.getName().getDomain()).isEqualTo("docker.io");
assertThat(request.getName().getName()).isEqualTo("library/build-image-test"); assertThat(request.getName().getName()).isEqualTo("library/build-image-test");
@ -84,6 +86,7 @@ class BootBuildImageTests {
void whenImageNameIsSpecifiedThenItIsUsedInRequest() { void whenImageNameIsSpecifiedThenItIsUsedInRequest() {
this.project.setVersion("1.2.3"); this.project.setVersion("1.2.3");
this.buildImage.setImageName("example.com/test/build-image:1.0"); 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(); BuildRequest request = this.buildImage.createRequest();
assertThat(request.getName().getDomain()).isEqualTo("example.com"); assertThat(request.getName().getDomain()).isEqualTo("example.com");
assertThat(request.getName().getName()).isEqualTo("test/build-image"); assertThat(request.getName().getName()).isEqualTo("test/build-image");

Loading…
Cancel
Save