Merge branch '2.3.x'

Closes gh-23208
This commit is contained in:
Andy Wilkinson 2020-09-07 16:15:31 +01:00
commit ab669bd73c

View File

@ -138,7 +138,7 @@ class DeploymentIntegrationTests {
super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy())
.withDockerfileFromBuilder((builder) -> builder.from(baseImage)
.add("spring-boot.war", deploymentLocation + "/spring-boot.war").build()));
withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(10));
withExposedPorts(port).withStartupTimeout(Duration.ofMinutes(5)).withStartupAttempts(3);
}
private static File findWarToDeploy() {