Add Java 21 support + fix Java 8
This commit is contained in:
parent
b0115943c8
commit
f12db20ac9
3 changed files with 5 additions and 4 deletions
|
@ -29,7 +29,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0-only"
|
||||||
RUN true
|
RUN true
|
||||||
RUN nice -20 apk update
|
RUN nice -20 apk update
|
||||||
RUN nice -20 apk upgrade
|
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
|
RUN mkdir /app
|
||||||
ADD entrypoint.sh /app/entrypoint.sh
|
ADD entrypoint.sh /app/entrypoint.sh
|
||||||
COPY --from=builder /builder/bin/rcon /usr/bin/rcon
|
COPY --from=builder /builder/bin/rcon /usr/bin/rcon
|
||||||
|
|
|
@ -44,7 +44,8 @@ MCSD_MEMORY_MIN=2048M
|
||||||
## <= 1.16 | 8
|
## <= 1.16 | 8
|
||||||
## <= 1.16 | 11 (may increase performance)
|
## <= 1.16 | 11 (may increase performance)
|
||||||
## >= 1.17 | 17
|
## >= 1.17 | 17
|
||||||
MCSD_JAVA_VERSION=17
|
## >= 1.20.5 | 21
|
||||||
|
MCSD_JAVA_VERSION=21
|
||||||
|
|
||||||
# OPTIMIZED_FLAGS
|
# OPTIMIZED_FLAGS
|
||||||
## Applies a modified variant of Aikar's Flags
|
## Applies a modified variant of Aikar's Flags
|
||||||
|
|
|
@ -71,7 +71,7 @@ function initialize() {
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
# Java version
|
# 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"
|
echo ":: Warning: No/Invalid java version supplied to \$MCSD_JAVA_VERSION, defaulting to java version 17"
|
||||||
export "MCSD_JAVA_VERSION=17"
|
export "MCSD_JAVA_VERSION=17"
|
||||||
fi
|
fi
|
||||||
|
@ -156,7 +156,7 @@ function compile_flags() {
|
||||||
internal_error "\$MCSD_GARBAGECOLLECTOR has invalid value"
|
internal_error "\$MCSD_GARBAGECOLLECTOR has invalid value"
|
||||||
;;
|
;;
|
||||||
esac
|
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"
|
export "FLAGS=${FLAGS} --add-modules=jdk.incubator.vector"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue