Mirror/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2024-06-07 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving Java 19 to 20 and adding Alpine (#2162)

Browse Source
This commit is contained in:
chblodg 2023-05-31 09:15:30 -07:00 committed by GitHub
parent 1aed25905d
commit e443d6ecf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build-multiarch.yml vendored
View File

@ -18,7 +18,8 @@ jobs:
matrix: matrix:
# NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
variant: variant:
- java19 - java20
- java20-alpine
- java17 - java17
- java17-graalvm-ce - java17-graalvm-ce
- java17-jdk - java17-jdk
@ -33,11 +34,15 @@ jobs:
- java11-openj9 - java11-openj9
- java11-jdk - java11-jdk
include: include:
# JAVA 19: # JAVA 20:
- variant: java19 - variant: java20
baseImage: eclipse-temurin:19-jre-focal baseImage: eclipse-temurin:20-jre
platforms: linux/amd64,linux/arm/v7,linux/arm64 platforms: linux/amd64,linux/arm/v7,linux/arm64
mcVersion: 1.19.3 mcVersion: 1.19.3
- variant: java20-alpine
baseImage: eclipse-temurin:20-jre-alpine
platforms: linux/amd64
mcVersion: 1.19.3
# JAVA 17: # JAVA 17:
- variant: java17 - variant: java17
# jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343

6
.github/workflows/verify-pr.yml vendored
View File

@ -16,10 +16,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
variant: variant:
- java20
- java17 - java17
- java17-alpine - java17-alpine
- java8-multiarch - java8-multiarch
include: include:
# JAVA 20:
- variant: java20
baseImage: eclipse-temurin:20-jre
platforms: linux/amd64,linux/arm/v7,linux/arm64
mcVersion: 1.19.3
# JAVA 17: # JAVA 17:
- variant: java17 - variant: java17
# jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343 # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343

4
README.md
View File

@ -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-openj9 | 17 | Debian | OpenJ9 | amd64 |
| java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 | | java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 |
| java17-alpine | 17 | Alpine | Hotspot | amd64 | | 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: 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 ### Deprecated Image Tags
The following image tags have been deprecated and are no longer receiving updates: The following image tags have been deprecated and are no longer receiving updates:
- java19
- adopt13 - adopt13
- adopt14 - adopt14
- adopt15 - adopt15

5
docs/versions/java.md
View File

@ -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-openj9 | 17 | Debian | OpenJ9 | amd64 |
| java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 | | java17-graalvm-ce | 17 | Oracle | GraalVM CE | amd64,arm64 |
| java17-alpine | 17 | Alpine | Hotspot | amd64 | | 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: 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 ### Deprecated Image Tags
The following image tags have been deprecated and are no longer receiving updates: The following image tags have been deprecated and are no longer receiving updates:
- java19
- adopt13 - adopt13
- adopt14 - adopt14
- adopt15 - adopt15