diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a93c4e6..cae518a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '11' ] + java: [ 'openjdk@1.17' ] steps: - uses: actions/checkout@v4.1.1 with: diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index ef8c55c9..31e6dd86 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - java: [ 'openjdk@1.11' ] + java: [ 'openjdk@1.17' ] steps: - uses: actions/checkout@v4.1.1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79e1306f..a18b6fc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - java: [ 'openjdk@1.11' ] + java: [ 'openjdk@1.17' ] steps: - uses: actions/checkout@v4.1.1 with: diff --git a/docker/build-images.sh b/docker/build-images.sh index 2494336f..05a76645 100755 --- a/docker/build-images.sh +++ b/docker/build-images.sh @@ -32,7 +32,7 @@ cd "$(dirname "$0")" trap "{ docker buildx rm sharry-builder; }" EXIT -platforms="linux/amd64,linux/aarch64,linux/arm/v7" +platforms="linux/amd64,linux/arm64" docker buildx create --name sharry-builder --use if [[ $version == *SNAPSHOT* ]]; then diff --git a/docker/sharry.dockerfile b/docker/sharry.dockerfile index 3cb9a4dd..7cf21ebf 100644 --- a/docker/sharry.dockerfile +++ b/docker/sharry.dockerfile @@ -6,9 +6,7 @@ ARG version= ARG sharry_url= ARG TARGETPLATFORM -RUN JDKPKG="openjdk11"; \ - if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \ - apk -U add --no-cache $JDKPKG tzdata unzip curl bash +RUN apk -U add --no-cache openjdk17 tzdata unzip curl bash WORKDIR /opt diff --git a/modules/microsite/docs/doc/install.md b/modules/microsite/docs/doc/install.md index 72ab99e1..e9bf1d4f 100644 --- a/modules/microsite/docs/doc/install.md +++ b/modules/microsite/docs/doc/install.md @@ -30,9 +30,9 @@ other options. It is enough to install the JRE. The JDK is required, if you want to build sharry from source. -Sharry has been tested with Java version 1.8 (or sometimes referred -to as JRE 8 and JDK 8, respectively). The pre-build packages are also -build using JDK 8. But a later version of Java should work as well. +Sharry has been tested with Java version 17. The pre-build packages +are also build using JDK 17. But a later version of Java should work +as well. ## Database