root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-23208
This commit is contained in:
Andy Wilkinson 2020-09-07 16:15:31 +01:00
parent 268dfceffd b9ee545c78
commit ab669bd73c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tests/spring-boot-deployment-tests/src/intTest/java/sample/DeploymentIntegrationTests.java
View File

@ -138,7 +138,7 @@ class DeploymentIntegrationTests {
super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy()) super(new ImageFromDockerfile().withFileFromFile("spring-boot.war", findWarToDeploy())
.withDockerfileFromBuilder((builder) -> builder.from(baseImage) .withDockerfileFromBuilder((builder) -> builder.from(baseImage)
.add("spring-boot.war", deploymentLocation + "/spring-boot.war").build())); .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() { private static File findWarToDeploy() {