Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-37741
This commit is contained in:
Phillip Webb
2023-10-05 21:30:43 -07:00
parent 3321d15911 2a35667295
commit b0b3adb1b7
10 changed files with 91 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@@ -2,10 +2,14 @@ plugins {
id "java"
id "org.springframework.boot.conventions"
id "org.springframework.boot.integration-test"
id "de.undercouch.download"
}
description = "Spring Boot Loader Integration Tests"
def oracleJdkVersion = "17.0.8"
def oracleJdkArch = "aarch64".equalsIgnoreCase(System.getProperty("os.arch")) ? "aarch64" : "x86"
configurations {
app
}
@@ -39,6 +43,26 @@ task buildApp(type: GradleBuild) {
tasks = ["build"]
}
task downloadJdk(type: Download) {
def destFolder = new File(rootProject.buildDir, "downloads/jdk/oracle")
destFolder.mkdirs()
src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
dest destFolder
tempAndMove true
overwrite false
}
task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk
from "${rootProject.buildDir}/downloads/jdk/oracle/"
include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
into "${project.buildDir}/downloads/jdk/oracle/"
}
processIntTestResources {
dependsOn syncJdkDownloads
}
intTest {
dependsOn buildApp
}
}

9
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
View File

@@ -127,10 +127,11 @@ 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));
ImageFromDockerfile image = new ImageFromDockerfile("spring-boot-loader/oracle-jdk");
image.withFileFromFile("Dockerfile", new File("src/intTest/resources/conf/oracle-jdk-17/Dockerfile"));
for (File file : new File("build/downloads/jdk/oracle").listFiles()) {
image.withFileFromFile("downloads/" + file.getName(), file);
}
return new JavaRuntime("Oracle JDK 17", JavaVersion.SEVENTEEN, () -> new GenericContainer<>(image));
}

14
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
View File

@@ -1,8 +1,10 @@
FROM ubuntu:jammy-20230624 as prepare
COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1
FROM ubuntu:jammy-20230624
RUN apt-get update && \
apt-get install -y software-properties-common curl && \
mkdir -p /opt/oraclejdk && \
cd /opt/oraclejdk && \
curl -L https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.tar.gz | tar zx --strip-components=1
ENV JAVA_HOME /opt/oraclejdk
COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk
ENV PATH $JAVA_HOME/bin:$PATH

8
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64
View File

@@ -1,8 +0,0 @@
FROM ubuntu:jammy-20230624
RUN apt-get update && \
apt-get install -y software-properties-common curl && \
mkdir -p /opt/oraclejdk && \
cd /opt/oraclejdk && \
curl -L https://download.oracle.com/java/17/archive/jdk-17.0.8_linux-aarch64_bin.tar.gz | tar zx --strip-components=1
ENV JAVA_HOME /opt/oraclejdk
ENV PATH $JAVA_HOME/bin:$PATH