Skip to content

Commit f9cf31e

Browse files
Fix compile errors
See gh-28844
1 parent 09c7ce6 commit f9cf31e

File tree

3 files changed

+7
-3
lines changed
  • spring-boot-project/spring-boot-tools
    • spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration
    • spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling
    • spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven

3 files changed

+7
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public DockerConfiguration withPublishRegistryUserAuthentication(String username
104104

105105
public DockerConfiguration withEmptyPublishRegistryAuthentication() {
106106
return new DockerConfiguration(this.host, this.builderAuthentication,
107-
new DockerRegistryUserAuthentication("", "", "", ""));
107+
new DockerRegistryUserAuthentication("", "", "", ""), this.bindHostToBuilder);
108108
}
109109

110110
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/DockerSpecTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ void asDockerConfigurationWithHostConfigurationNoTlsVerify() {
7474
assertThat(host.getCertificatePath()).isNull();
7575
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
7676
assertThat(dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();
77-
assertThat(dockerSpec.asDockerConfiguration().getPublishRegistryAuthentication()).isNull();
77+
assertThat(decoded(dockerConfiguration.getPublishRegistryAuthentication().getAuthHeader()))
78+
.contains("\"username\" : \"\"").contains("\"password\" : \"\"").contains("\"email\" : \"\"")
79+
.contains("\"serveraddress\" : \"\"");
7880
}
7981

8082
@Test

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DockerTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ void asDockerConfigurationWithHostConfiguration() {
5757
assertThat(host.getCertificatePath()).isEqualTo("/tmp/ca-cert");
5858
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
5959
assertThat(docker.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();
60-
assertThat(docker.asDockerConfiguration().getPublishRegistryAuthentication()).isNull();
60+
assertThat(decoded(dockerConfiguration.getPublishRegistryAuthentication().getAuthHeader()))
61+
.contains("\"username\" : \"\"").contains("\"password\" : \"\"").contains("\"email\" : \"\"")
62+
.contains("\"serveraddress\" : \"\"");
6163
}
6264

6365
@Test

0 commit comments

Comments
 (0)