JeremyStarTM/MCServerDocker
1
0
Fork 0
Code Issues Pull requests Releases Activity

Add Java 21 support + fix Java 8

Browse source
This commit is contained in:
JeremyStar™ 2024-07-10 12:35:48 +02:00
parent b0115943c8
commit f12db20ac9
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -29,7 +29,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0-only"
RUN true
RUN nice -20 apk update
RUN nice -20 apk upgrade
RUN nice -20 apk add bash libstdc++ openjdk21-jre openjdk17-jre openjdk11-jre
RUN nice -20 apk add bash libstdc++ openjdk21-jre openjdk17-jre openjdk11-jre openjdk8-jre
RUN mkdir /app
ADD entrypoint.sh /app/entrypoint.sh
COPY --from=builder /builder/bin/rcon /usr/bin/rcon

3
config.example.env
View file

@ -44,7 +44,8 @@ MCSD_MEMORY_MIN=2048M
## <= 1.16 | 8
## <= 1.16 | 11 (may increase performance)
## >= 1.17 | 17
MCSD_JAVA_VERSION=17
## >= 1.20.5 | 21
MCSD_JAVA_VERSION=21
# OPTIMIZED_FLAGS
## Applies a modified variant of Aikar's Flags

4
entrypoint.sh
View file

@ -71,7 +71,7 @@ function initialize() {
exit 1
fi
# Java version
if [ ! "${MCSD_JAVA_VERSION}" == "17" ] && [ ! "${MCSD_JAVA_VERSION}" == "11" ] && [ ! "${MCSD_JAVA_VERSION}" == "8" ]; then
if [ ! "${MCSD_JAVA_VERSION}" == "21" ] && [ ! "${MCSD_JAVA_VERSION}" == "17" ] && [ ! "${MCSD_JAVA_VERSION}" == "11" ] && [ ! "${MCSD_JAVA_VERSION}" == "8" ]; then
echo ":: Warning: No/Invalid java version supplied to \$MCSD_JAVA_VERSION, defaulting to java version 17"
export "MCSD_JAVA_VERSION=17"
fi
@ -156,7 +156,7 @@ function compile_flags() {
internal_error "\$MCSD_GARBAGECOLLECTOR has invalid value"
;;
esac
if [ "${MCSD_JAVA_VERSION}" == "17" ]; then
if [ "${MCSD_JAVA_VERSION}" == "17" ] || [ "${MCSD_JAVA_VERSION}" == "21" ]; then
export "FLAGS=${FLAGS} --add-modules=jdk.incubator.vector"
fi
}