From e443d6ecf4fc0c69a98ede0dbd4ea1d2fd26a55a Mon Sep 17 00:00:00 2001 From: chblodg Date: Wed, 31 May 2023 09:15:30 -0700 Subject: [PATCH] Moving Java 19 to 20 and adding Alpine (#2162) --- .github/workflows/build-multiarch.yml | 13 +++++++++---- .github/workflows/verify-pr.yml | 6 ++++++ README.md | 4 +++- docs/versions/java.md | 5 +++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index ceec1765..dd03276d 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -18,7 +18,8 @@ jobs: matrix: # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config variant: - - java19 + - java20 + - java20-alpine - java17 - java17-graalvm-ce - java17-jdk @@ -33,11 +34,15 @@ jobs: - java11-openj9 - java11-jdk include: - # JAVA 19: - - variant: java19 - baseImage: eclipse-temurin:19-jre-focal + # JAVA 20: + - variant: java20 + baseImage: eclipse-temurin:20-jre platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.19.3 + - variant: java20-alpine + baseImage: eclipse-temurin:20-jre-alpine + platforms: linux/amd64 + mcVersion: 1.19.3 # JAVA 17: - variant: java17 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index db6d0ee2..240d7ec7 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -16,10 +16,16 @@ jobs: fail-fast: false matrix: variant: + - java20 - java17 - java17-alpine - java8-multiarch include: + # JAVA 20: + - variant: java20 + baseImage: eclipse-temurin:20-jre + platforms: linux/amd64,linux/arm/v7,linux/arm64 + mcVersion: 1.19.3 # JAVA 17: - variant: java17 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 diff --git a/README.md b/README.md index 226e34d5..dc8128d7 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,8 @@ When using the image `itzg/minecraft-server` without a tag, the `latest` image t | java17-openj9 | 17 | Debian | OpenJ9 | amd64 | | java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 | | java17-alpine | 17 | Alpine | Hotspot | amd64 | -| java19 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | +| java20-alpine | 19 | Alpine | Hotspot | amd64 | +| java20 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | For example, to use Java version 8 on any supported architecture: @@ -214,6 +215,7 @@ For example, to use Java version 8 on any supported architecture: ### Deprecated Image Tags The following image tags have been deprecated and are no longer receiving updates: +- java19 - adopt13 - adopt14 - adopt15 diff --git a/docs/versions/java.md b/docs/versions/java.md index d7532204..56df54e6 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -22,7 +22,8 @@ When using the image `itzg/minecraft-server` without a tag, the `latest` image t | java17-openj9 | 17 | Debian | OpenJ9 | amd64 | | java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 | | java17-alpine | 17 | Alpine | Hotspot | amd64 | -| java19 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | +| java20-alpine | 19 | Alpine | Hotspot | amd64 | +| java20 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | For example, to use Java version 8 on any supported architecture: @@ -37,7 +38,7 @@ For example, to use Java version 8 on any supported architecture: ### Deprecated Image Tags The following image tags have been deprecated and are no longer receiving updates: - +- java19 - adopt13 - adopt14 - adopt15