From e469bfac68598bdbec77a1f826883a055b56f87c Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 07:18:20 -0700 Subject: [PATCH 1/6] adding java 19 alpine linux --- .github/workflows/build-multiarch.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index ceec17656df..e68adda03fe 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -19,6 +19,7 @@ jobs: # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config variant: - java19 + - java19-alpine - java17 - java17-graalvm-ce - java17-jdk @@ -38,6 +39,10 @@ jobs: baseImage: eclipse-temurin:19-jre-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.19.3 + - variant: java19-alpine + baseImage: eclipse-temurin:19-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 From 6addb1ba0ae9c8321c8ad1a8074c950a138d8d99 Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 07:54:38 -0700 Subject: [PATCH 2/6] adding alpine 19 to docs, updating verify pr yml with alpine 19 --- .github/workflows/verify-pr.yml | 10 ++++++---- README.md | 1 + docs/versions/java.md | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index db6d0ee2aaa..7f0a3352491 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -16,20 +16,22 @@ jobs: fail-fast: false matrix: variant: + - java19-alpine - java17 - java17-alpine - java8-multiarch include: + # JAVA 19: + - variant: java19-alpine + baseImage: eclipse-temurin:19-jre-alpine + platforms: linux/amd64 + mcVersion: 1.19.4 # JAVA 17: - variant: java17 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 baseImage: eclipse-temurin:17-jre-focal platforms: linux/amd64 mcVersion: 1.18.2 - - variant: java17-alpine - baseImage: eclipse-temurin:17-jre-alpine - platforms: linux/amd64 - mcVersion: 1.18.2 - variant: java8-multiarch baseImage: eclipse-temurin:8u312-b07-jre-focal platforms: linux/amd64 diff --git a/README.md b/README.md index 226e34d52ae..329597ca2c4 100644 --- a/README.md +++ b/README.md @@ -201,6 +201,7 @@ 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-alpine | 19 | Alpine | Hotspot | amd64 | | java19 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | For example, to use Java version 8 on any supported architecture: diff --git a/docs/versions/java.md b/docs/versions/java.md index d7532204cff..5ba2362ea42 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -22,6 +22,7 @@ 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-alpine | 19 | Alpine | Hotspot | amd64 | | java19 | 19 | Ubuntu | Hotspot | amd64,arm64,armv7 | For example, to use Java version 8 on any supported architecture: From 2b51ad5d4e517f76b7bb0e2ab97c942fda478968 Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 07:58:33 -0700 Subject: [PATCH 3/6] reverting verify pr --- .github/workflows/verify-pr.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index 7f0a3352491..db6d0ee2aaa 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -16,22 +16,20 @@ jobs: fail-fast: false matrix: variant: - - java19-alpine - java17 - java17-alpine - java8-multiarch include: - # JAVA 19: - - variant: java19-alpine - baseImage: eclipse-temurin:19-jre-alpine - platforms: linux/amd64 - mcVersion: 1.19.4 # JAVA 17: - variant: java17 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 baseImage: eclipse-temurin:17-jre-focal platforms: linux/amd64 mcVersion: 1.18.2 + - variant: java17-alpine + baseImage: eclipse-temurin:17-jre-alpine + platforms: linux/amd64 + mcVersion: 1.18.2 - variant: java8-multiarch baseImage: eclipse-temurin:8u312-b07-jre-focal platforms: linux/amd64 From c952e3e75095e8b151f2a2825a6cab6a170fad9f Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 08:11:44 -0700 Subject: [PATCH 4/6] by passing 19 and moving to jre 20 --- .github/workflows/build-multiarch.yml | 12 ++++++------ .github/workflows/verify-pr.yml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index e68adda03fe..977ea2f3102 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -18,8 +18,8 @@ jobs: matrix: # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config variant: - - java19 - - java19-alpine + - java20 + - java20-alpine - java17 - java17-graalvm-ce - java17-jdk @@ -34,13 +34,13 @@ 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-focal platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.19.3 - variant: java19-alpine - baseImage: eclipse-temurin:19-jre-alpine + baseImage: eclipse-temurin:20-jre-alpine platforms: linux/amd64 mcVersion: 1.19.3 # JAVA 17: diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index db6d0ee2aaa..240d7ec7702 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 From f28ea020c67276da7955c5ae0c18eb2747b0ea9a Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 08:17:51 -0700 Subject: [PATCH 5/6] Saving my multiarch build yaml which missed the java 20 includes --- .github/workflows/build-multiarch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 977ea2f3102..dd03276dc30 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -36,10 +36,10 @@ jobs: include: # JAVA 20: - variant: java20 - baseImage: eclipse-temurin:20-jre-focal + baseImage: eclipse-temurin:20-jre platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.19.3 - - variant: java19-alpine + - variant: java20-alpine baseImage: eclipse-temurin:20-jre-alpine platforms: linux/amd64 mcVersion: 1.19.3 From 4f80e40ead27d5de26688a6354d6c00d08b13d0a Mon Sep 17 00:00:00 2001 From: christopher blodgett Date: Wed, 31 May 2023 08:36:31 -0700 Subject: [PATCH 6/6] Updating Readme with 20 and deprecating java19 image --- README.md | 5 +++-- docs/versions/java.md | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 329597ca2c4..dc8128d7a15 100644 --- a/README.md +++ b/README.md @@ -201,8 +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-alpine | 19 | 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: @@ -215,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 5ba2362ea42..56df54e68f9 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -22,8 +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-alpine | 19 | 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: @@ -38,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