Skip to content

Commit 8129363

Browse files
authored
Added: riscv64 support (#4144)
1 parent 3c3e49e commit 8129363

5 files changed

Lines changed: 24 additions & 21 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ jobs:
4040
include:
4141
# JAVA 25
4242
- variant: java25
43-
baseImage: eclipse-temurin:25-jre
44-
platforms: linux/amd64,linux/arm64
43+
# NOTE: 25-jre is also Noble (currently), but this variant needs to be 25-jre-noble specifically to include riscv64
44+
# Keep this aligned in verify-pr.yml also
45+
baseImage: eclipse-temurin:25-jre-noble
46+
platforms: linux/amd64,linux/arm64,linux/riscv64
4547
mcVersion: latest
4648
- variant: java25-alpine
4749
baseImage: eclipse-temurin:25-jre-alpine

.github/workflows/verify-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
include:
3030
# JAVA 21/25:
3131
- variant: java25
32-
baseImage: eclipse-temurin:25-jre
32+
# stay aligned with build.yml
33+
baseImage: eclipse-temurin:25-jre-noble
3334
platforms: linux/amd64,linux/arm64
3435
mcVersion: latest
3536
- variant: java25-alpine

build/ubuntu/install-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ apt-get install -y \
3838
apt-get clean
3939

4040
# Download and install patched knockd
41-
curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
41+
curl -fsSL -o /tmp/knock.tar.gz https://github.com/Opvolger/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
4242
tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
4343
ln -s /usr/local/sbin/knockd /usr/sbin/knockd
4444
setcap cap_net_raw=ep /usr/local/sbin/knockd

docs/versions/java.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ or explicitly include the tag, such as
1010

1111
where `<tag>` refers to the first column of this table:
1212

13-
| Tag | Java version | Linux | JVM Type | Architecture | Note |
14-
|----------------|--------------|--------|--------------------|---------------------|------|
15-
| latest | 25 | Ubuntu | Hotspot | amd64, arm64 | |
16-
| stable | 25 | Ubuntu | Hotspot | amd64, arm64 | |
17-
| java25 | 25 | Ubuntu | Hotspot | amd64, arm64 | |
18-
| java25-alpine | 25 | Alpine | Hotspot | amd64, arm64 | |
19-
| java25-jdk | 25 | Ubuntu | Hotspot+JDK | amd64, arm64 | |
20-
| java21 | 21 | Ubuntu | Hotspot | amd64, arm64 | |
21-
| java21-jdk | 21 | Ubuntu | Hotspot+JDK | amd64, arm64 | |
22-
| java21-alpine | 21 | Alpine | Hotspot | amd64, arm64 | |
23-
| java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
24-
| java16 | 16 | Ubuntu | Hotspot | amd64, arm64, armv7 | (1) |
25-
| java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
26-
| java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
13+
| Tag | Java version | Linux | JVM Type | Architecture | Note |
14+
|---------------|--------------|--------|-------------|-----------------------|------|
15+
| latest | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | |
16+
| stable | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | |
17+
| java25 | 25 | Ubuntu | Hotspot | amd64, arm64, riscv64 | |
18+
| java25-alpine | 25 | Alpine | Hotspot | amd64, arm64 | |
19+
| java25-jdk | 25 | Ubuntu | Hotspot+JDK | amd64, arm64 | |
20+
| java21 | 21 | Ubuntu | Hotspot | amd64, arm64 | |
21+
| java21-jdk | 21 | Ubuntu | Hotspot+JDK | amd64, arm64 | |
22+
| java21-alpine | 21 | Alpine | Hotspot | amd64, arm64 | |
23+
| java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
24+
| java16 | 16 | Ubuntu | Hotspot | amd64, arm64, armv7 | (1) |
25+
| java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
26+
| java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | |
2727

2828
Notes
2929

images.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"java": "25",
66
"distribution": "ubuntu",
77
"jvm": "hotspot",
8-
"architectures": ["amd64", "arm64"],
8+
"architectures": ["amd64", "arm64", "riscv64"],
99
"lts": true
1010
},
1111
{
@@ -14,15 +14,15 @@
1414
"java": "25",
1515
"distribution": "ubuntu",
1616
"jvm": "hotspot",
17-
"architectures": ["amd64", "arm64"],
17+
"architectures": ["amd64", "arm64", "riscv64"],
1818
"lts": true
1919
},
2020
{
2121
"tag": "java25",
2222
"java": "25",
2323
"distribution": "ubuntu",
2424
"jvm": "hotspot",
25-
"architectures": ["amd64", "arm64"]
25+
"architectures": ["amd64", "arm64", "riscv64"]
2626
},
2727
{
2828
"tag": "java25-alpine",

0 commit comments

Comments
 (0)