|
|
|
|
@ -23,7 +23,6 @@ import java.util.List;
@@ -23,7 +23,6 @@ import java.util.List;
|
|
|
|
|
import java.util.function.Supplier; |
|
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
|
|
import org.junit.jupiter.api.condition.OS; |
|
|
|
|
import org.junit.jupiter.params.ParameterizedTest; |
|
|
|
|
import org.junit.jupiter.params.provider.MethodSource; |
|
|
|
|
import org.testcontainers.containers.GenericContainer; |
|
|
|
|
@ -34,7 +33,6 @@ import org.testcontainers.utility.DockerImageName;
@@ -34,7 +33,6 @@ import org.testcontainers.utility.DockerImageName;
|
|
|
|
|
import org.testcontainers.utility.MountableFile; |
|
|
|
|
|
|
|
|
|
import org.springframework.boot.system.JavaVersion; |
|
|
|
|
import org.springframework.boot.testsupport.junit.DisabledOnOs; |
|
|
|
|
import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable; |
|
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
|
|
|
|
|
@ -46,8 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
@@ -46,8 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|
|
|
|
* @author Phillip Webb |
|
|
|
|
*/ |
|
|
|
|
@DisabledIfDockerUnavailable |
|
|
|
|
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", |
|
|
|
|
disabledReason = "Not all docker images have ARM support") |
|
|
|
|
class LoaderIntegrationTests { |
|
|
|
|
|
|
|
|
|
private final ToStringConsumer output = new ToStringConsumer(); |
|
|
|
|
@ -124,8 +120,10 @@ class LoaderIntegrationTests {
@@ -124,8 +120,10 @@ class LoaderIntegrationTests {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static JavaRuntime oracleJdk17() { |
|
|
|
|
String arch = System.getProperty("os.arch"); |
|
|
|
|
String dockerFile = ("aarch64".equals(arch)) ? "Dockerfile-aarch64" : "Dockerfile"; |
|
|
|
|
ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk-17") |
|
|
|
|
.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/Dockerfile")); |
|
|
|
|
.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/" + dockerFile)); |
|
|
|
|
return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|