From b4fbfc4f3cde995469a1c1e6e4d6cfce05b7423e Mon Sep 17 00:00:00 2001 From: Niklas Reimer Date: Thu, 18 Jan 2024 11:05:15 +0100 Subject: [PATCH] update to java 21 --- .github/workflows/maven.yml | 4 ++-- .github/workflows/sonar.yml | 4 ++-- Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index acf28d6..2bbb3c6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Build with Maven run: mvn install diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index bbbb2cb..7ec67ae 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -14,11 +14,11 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 + - name: Set up JDK 12 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '11' + java-version: '21' - name: Cache SonarCloud packages uses: actions/cache@v3 with: diff --git a/Dockerfile b/Dockerfile index 7eede3b..f06c4a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM maven:3.8.6-openjdk-11-slim as build +FROM maven:3-eclipse-temurin-21 as build COPY $PWD /mtbexporter WORKDIR /mtbexporter RUN mvn install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -FROM gcr.io/distroless/java11-debian11 +FROM gcr.io/distroless/java-base-debian12:latest COPY --from=build /mtbexporter/target/mtbexporter-*-jar-with-dependencies.jar /app/mtbexporter.jar ENTRYPOINT ["java", "-jar", "/app/mtbexporter.jar"] \ No newline at end of file