Merge branch '2.3.x'

Closes gh-24108
This commit is contained in:
Stephane Nicoll
2020-11-10 17:10:26 +01:00
30 changed files with 190 additions and 83 deletions

View File

@@ -37,6 +37,7 @@ import org.springframework.boot.buildpack.platform.docker.type.Image;
import org.springframework.boot.buildpack.platform.docker.type.ImageReference;
import org.springframework.boot.gradle.junit.GradleCompatibility;
import org.springframework.boot.gradle.testkit.GradleBuild;
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
import static org.assertj.core.api.Assertions.assertThat;
@@ -104,7 +105,7 @@ public class BootBuildImageRegistryIntegrationTests {
private static class RegistryContainer extends GenericContainer<RegistryContainer> {
RegistryContainer() {
super("registry:2.7.1");
super(DockerImageNames.registry().toString());
addExposedPorts(5000);
addEnv("SERVER_NAME", "localhost");
}