Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source 
Closes gh-24108
This commit is contained in:
Stephane Nicoll
2020-11-10 17:10:26 +01:00
parent 24f29a6516 23ad2b4156
commit 515b18e142
30 changed files with 190 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java
View File

@@ -31,6 +31,7 @@ import org.springframework.boot.buildpack.platform.docker.DockerApi;
import org.springframework.boot.buildpack.platform.docker.UpdateListener;
import org.springframework.boot.buildpack.platform.docker.type.Image;
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
import static org.assertj.core.api.Assertions.assertThat;
@@ -79,7 +80,7 @@ public class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrati
private static class RegistryContainer extends GenericContainer<RegistryContainer> {
RegistryContainer() {
super("registry:2.7.1");
super(DockerImageNames.registry().toString());
addExposedPorts(5000);
addEnv("SERVER_NAME", "localhost");
}