Merge branch '2.3.x'

Closes gh-23208
5 years ago · ab669bd73c
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
+++ b/spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
@ -138,7 +138,7 @@ class DeploymentIntegrationTests {
				@@ -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() {