From eee1c06b38d66247e9bd07f1e70859b4545a9cb8 Mon Sep 17 00:00:00 2001 From: Felix Jordan Date: Tue, 27 Sep 2022 17:00:40 +0200 Subject: [PATCH] build: use Java 17 in GitHub actions and Docker base image --- .github/workflows/build_container.yaml | 4 ++-- .github/workflows/gradle.yml | 4 ++-- .github/workflows/release.yaml | 4 ++-- .github/workflows/release_rc.yaml | 4 ++-- Dockerfile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml index 8eb03d1e..62cdbc90 100644 --- a/.github/workflows/build_container.yaml +++ b/.github/workflows/build_container.yaml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build release bundle with Gradle run: ./gradlew export -x test #-Pservice.version=${{ steps.get_version.outputs.version-without-v }} - name: Docker metadata setup diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0b54c9d5..6a8fb309 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build with Gradle run: ./gradlew clean build --info - uses: codecov/codecov-action@v1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4953d0fc..303e2f3f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,10 +31,10 @@ jobs: - name: Get Version id: get_version uses: battila7/get-version-action@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build release bundle with Gradle run: ./gradlew packageDistribution -x test -Pservice.version=${{ steps.get_version.outputs.version-without-v }} - name: Create Release diff --git a/.github/workflows/release_rc.yaml b/.github/workflows/release_rc.yaml index 4e7baaec..9f572c87 100644 --- a/.github/workflows/release_rc.yaml +++ b/.github/workflows/release_rc.yaml @@ -31,10 +31,10 @@ jobs: - name: Get Version id: get_version uses: battila7/get-version-action@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 - name: Build release bundle with Gradle run: ./gradlew packageDistribution -x test -Pservice.version=${{ steps.get_version.outputs.version-without-v }} - name: Create Release diff --git a/Dockerfile b/Dockerfile index 24b51e1f..eb92ec85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build final container without build dependencies etc. -FROM openjdk:14-jdk-alpine +FROM openjdk:17-jdk-alpine ENV HTTP_PORT=8080 ENV HTTPS_PORT=8443