From 583e4b77608af842cc284c5d7d67477fd19986bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bas=20Magr=C3=A9?= Date: Mon, 18 May 2026 20:35:20 +0200 Subject: [PATCH 1/8] WIP: Added RISCV64 support --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e59de82fb1b..1b04df4f3d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,7 @@ jobs: matrix: # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config variant: + - java26-noble - java25 - java25-alpine - java25-jdk @@ -38,6 +39,11 @@ jobs: - java8 - java8-jdk include: + # JAVA 26 + - variant: java26-noble + baseImage: eclipse-temurin:26-jre-noble + platforms: linux/amd64,linux/arm64,linux/riscv64 + mcVersion: latest # JAVA 25 - variant: java25 baseImage: eclipse-temurin:25-jre From 37ffab6a5e0776a6671acae0d29e389e9cfb7795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bas=20Magr=C3=A9?= Date: Wed, 3 Jun 2026 23:54:52 +0200 Subject: [PATCH 2/8] knock with riscv64 support --- build/ubuntu/install-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ubuntu/install-packages.sh b/build/ubuntu/install-packages.sh index 91827cb64cc..2a6d476fabb 100755 --- a/build/ubuntu/install-packages.sh +++ b/build/ubuntu/install-packages.sh @@ -37,7 +37,7 @@ apt-get install -y \ apt-get clean # Download and install patched knockd -curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz +curl -fsSL -o /tmp/knock.tar.gz https://github.com/Opvolger/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz ln -s /usr/local/sbin/knockd /usr/sbin/knockd setcap cap_net_raw=ep /usr/local/sbin/knockd From 473f76bf06e784aa386cc5dca6ca7ef460f34a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bas=20Magr=C3=A9?= Date: Wed, 1 Jul 2026 20:03:39 +0200 Subject: [PATCH 3/8] use java25 LTS --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b04df4f3d4..b86d338e45e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,9 +26,9 @@ jobs: matrix: # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config variant: - - java26-noble - java25 - java25-alpine + - java25-noble - java25-jdk - java21 - java21-alpine @@ -39,11 +39,6 @@ jobs: - java8 - java8-jdk include: - # JAVA 26 - - variant: java26-noble - baseImage: eclipse-temurin:26-jre-noble - platforms: linux/amd64,linux/arm64,linux/riscv64 - mcVersion: latest # JAVA 25 - variant: java25 baseImage: eclipse-temurin:25-jre @@ -53,6 +48,10 @@ jobs: baseImage: eclipse-temurin:25-jre-alpine platforms: linux/amd64,linux/arm64 mcVersion: latest + - variant: java25-noble + baseImage: eclipse-temurin:25-jre-noble + platforms: linux/amd64,linux/arm64,linux/riscv64 + mcVersion: latest - variant: java25-jdk baseImage: eclipse-temurin:25 platforms: linux/amd64,linux/arm64 From 87dda792abbeba86ccf0b5b6f22f5c29fed75704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bas=20Magr=C3=A9?= Date: Fri, 10 Jul 2026 22:56:20 +0200 Subject: [PATCH 4/8] java25-noble and java25 are ubuntu 24.04, use only noble --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b86d338e45e..34fd18e7422 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,14 +41,6 @@ jobs: include: # JAVA 25 - variant: java25 - baseImage: eclipse-temurin:25-jre - platforms: linux/amd64,linux/arm64 - mcVersion: latest - - variant: java25-alpine - baseImage: eclipse-temurin:25-jre-alpine - platforms: linux/amd64,linux/arm64 - mcVersion: latest - - variant: java25-noble baseImage: eclipse-temurin:25-jre-noble platforms: linux/amd64,linux/arm64,linux/riscv64 mcVersion: latest @@ -56,6 +48,10 @@ jobs: baseImage: eclipse-temurin:25 platforms: linux/amd64,linux/arm64 mcVersion: latest + - variant: java25-alpine + baseImage: eclipse-temurin:25-jre-alpine + platforms: linux/amd64,linux/arm64 + mcVersion: latest # JAVA 21: - variant: java21 baseImage: eclipse-temurin:21-jre From 43dd9257845a3ab325f87d81f3bb0fc143be5aa8 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 10 Jul 2026 19:38:47 -0500 Subject: [PATCH 5/8] Remove extra matrix entry --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34fd18e7422..5cd4904f8a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,6 @@ jobs: variant: - java25 - java25-alpine - - java25-noble - java25-jdk - java21 - java21-alpine @@ -41,6 +40,7 @@ jobs: include: # JAVA 25 - variant: java25 + # NOTE: 25-jre is also Noble (currently), but this variant needs to be 25-jre-noble specifically to include riscv64 baseImage: eclipse-temurin:25-jre-noble platforms: linux/amd64,linux/arm64,linux/riscv64 mcVersion: latest From 21c20b368ce477969afad9cfd5719bd8b9cc3b2a Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 10 Jul 2026 19:39:12 -0500 Subject: [PATCH 6/8] Update docs and metadata to include riscv64 --- docs/versions/java.md | 28 ++++++++++++++-------------- images.json | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/versions/java.md b/docs/versions/java.md index 96b1e32cdff..f49eb0b6698 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -10,20 +10,20 @@ or explicitly include the tag, such as where `` refers to the first column of this table: -| Tag | Java version | Linux | JVM Type | Architecture | Note | -|----------------|--------------|--------|--------------------|---------------------|------| -| latest | 25 | Ubuntu | Hotspot | amd64, arm64 | | -| stable | 25 | Ubuntu | Hotspot | amd64, arm64 | | -| java25 | 25 | Ubuntu | Hotspot | amd64, arm64 | | -| java25-alpine | 25 | Alpine | Hotspot | amd64, arm64 | | -| java25-jdk | 25 | Ubuntu | Hotspot+JDK | amd64, arm64 | | -| java21 | 21 | Ubuntu | Hotspot | amd64, arm64 | | -| java21-jdk | 21 | Ubuntu | Hotspot+JDK | amd64, arm64 | | -| java21-alpine | 21 | Alpine | Hotspot | amd64, arm64 | | -| java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | | -| java16 | 16 | Ubuntu | Hotspot | amd64, arm64, armv7 | (1) | -| java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | | -| java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | | +| Tag | Java version | Linux | JVM Type | Architecture | Note | +|---------------|--------------|--------|-------------|-----------------------|------| +| latest | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | | +| stable | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | | +| java25 | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | | +| java25-alpine | 25 | Alpine | Hotspot | amd64, arm64 | | +| java25-jdk | 25 | Ubuntu | Hotspot+JDK | amd64, arm64 | | +| java21 | 21 | Ubuntu | Hotspot | amd64, arm64 | | +| java21-jdk | 21 | Ubuntu | Hotspot+JDK | amd64, arm64 | | +| java21-alpine | 21 | Alpine | Hotspot | amd64, arm64 | | +| java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | | +| java16 | 16 | Ubuntu | Hotspot | amd64, arm64, armv7 | (1) | +| java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | | +| java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | | Notes diff --git a/images.json b/images.json index aad1ccf3a33..dfe915dbd16 100644 --- a/images.json +++ b/images.json @@ -5,7 +5,7 @@ "java": "25", "distribution": "ubuntu", "jvm": "hotspot", - "architectures": ["amd64", "arm64"], + "architectures": ["amd64", "arm64", "riscv64"], "lts": true }, { @@ -14,7 +14,7 @@ "java": "25", "distribution": "ubuntu", "jvm": "hotspot", - "architectures": ["amd64", "arm64"], + "architectures": ["amd64", "arm64", "riscv64"], "lts": true }, { @@ -22,7 +22,7 @@ "java": "25", "distribution": "ubuntu", "jvm": "hotspot", - "architectures": ["amd64", "arm64"] + "architectures": ["amd64", "arm64", "riscv64"] }, { "tag": "java25-alpine", From 63162183530ff9eb8581f83b3d0ef07c49416fb0 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 10 Jul 2026 19:40:20 -0500 Subject: [PATCH 7/8] Update verify-pr --- .github/workflows/build.yml | 1 + .github/workflows/verify-pr.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5cd4904f8a9..3973c38b06f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: # JAVA 25 - variant: java25 # NOTE: 25-jre is also Noble (currently), but this variant needs to be 25-jre-noble specifically to include riscv64 + # Keep this aligned in verify-pr.yml also baseImage: eclipse-temurin:25-jre-noble platforms: linux/amd64,linux/arm64,linux/riscv64 mcVersion: latest diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index 9ac2fd9ebd2..581db1bae7d 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -29,7 +29,8 @@ jobs: include: # JAVA 21/25: - variant: java25 - baseImage: eclipse-temurin:25-jre + # stay aligned with build.yml + baseImage: eclipse-temurin:25-jre-noble platforms: linux/amd64,linux/arm64 mcVersion: latest - variant: java25-alpine From 33b19e859618095b1f191b045340a3705ace3d2c Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 11 Jul 2026 11:22:57 -0500 Subject: [PATCH 8/8] Narrow changes in build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3973c38b06f..17eb864933e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,14 +45,14 @@ jobs: baseImage: eclipse-temurin:25-jre-noble platforms: linux/amd64,linux/arm64,linux/riscv64 mcVersion: latest - - variant: java25-jdk - baseImage: eclipse-temurin:25 - platforms: linux/amd64,linux/arm64 - mcVersion: latest - variant: java25-alpine baseImage: eclipse-temurin:25-jre-alpine platforms: linux/amd64,linux/arm64 mcVersion: latest + - variant: java25-jdk + baseImage: eclipse-temurin:25 + platforms: linux/amd64,linux/arm64 + mcVersion: latest # JAVA 21: - variant: java21 baseImage: eclipse-temurin:21-jre