|
23 | 23 | import java.util.function.Supplier;
|
24 | 24 | import java.util.stream.Stream;
|
25 | 25 |
|
26 |
| -import org.junit.jupiter.api.condition.OS; |
27 | 26 | import org.junit.jupiter.params.ParameterizedTest;
|
28 | 27 | import org.junit.jupiter.params.provider.MethodSource;
|
29 | 28 | import org.testcontainers.containers.GenericContainer;
|
|
34 | 33 | import org.testcontainers.utility.MountableFile;
|
35 | 34 |
|
36 | 35 | import org.springframework.boot.system.JavaVersion;
|
37 |
| -import org.springframework.boot.testsupport.junit.DisabledOnOs; |
38 | 36 | import org.springframework.boot.testsupport.testcontainers.DisabledIfDockerUnavailable;
|
39 | 37 | import org.springframework.util.Assert;
|
40 | 38 |
|
|
46 | 44 | * @author Phillip Webb
|
47 | 45 | */
|
48 | 46 | @DisabledIfDockerUnavailable
|
49 |
| -@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64", |
50 |
| - disabledReason = "Not all docker images have ARM support") |
51 | 47 | class LoaderIntegrationTests {
|
52 | 48 |
|
53 | 49 | private final ToStringConsumer output = new ToStringConsumer();
|
@@ -124,8 +120,10 @@ static JavaRuntime openJdk(JavaVersion version) {
|
124 | 120 | }
|
125 | 121 |
|
126 | 122 | static JavaRuntime oracleJdk17() {
|
| 123 | + String arch = System.getProperty("os.arch"); |
| 124 | + String dockerFile = ("aarch64".equals(arch)) ? "Dockerfile-aarch64" : "Dockerfile"; |
127 | 125 | ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk-17")
|
128 |
| - .withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/Dockerfile")); |
| 126 | + .withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/" + dockerFile)); |
129 | 127 | return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image));
|
130 | 128 | }
|
131 | 129 |
|
|
0 commit comments