Attempt a build on ojdk11

This commit is contained in:
Salt 2021-05-24 21:46:29 -05:00
parent 60943d2f82
commit c50a4b4176
2 changed files with 2 additions and 4 deletions

View File

@ -8,7 +8,7 @@ ARG FORGE_VERSION="36.1.13"
# The actual setup work # The actual setup work
COPY start-server.sh /minecraft/start-server.sh COPY start-server.sh /minecraft/start-server.sh
WORKDIR /minecraft WORKDIR /minecraft
RUN apk add curl openjdk8-jre &&\ RUN apk add curl openjdk11-jre &&\
curl -L "https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar" -o installer.jar &&\ curl -L "https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar" -o installer.jar &&\
java -jar installer.jar --installServer &&\ java -jar installer.jar --installServer &&\
echo "eula=true" > eula.txt &&\ echo "eula=true" > eula.txt &&\
@ -16,7 +16,7 @@ RUN apk add curl openjdk8-jre &&\
ln -s "forge-${MINECRAFT_VERSION}-${FORGE_VERSION}.jar" server.jar ln -s "forge-${MINECRAFT_VERSION}-${FORGE_VERSION}.jar" server.jar
# The second stage is the actual container # The second stage is the actual container
FROM openjdk:8 FROM openjdk:11
RUN apt-get update && apt-get install rsync screen -y RUN apt-get update && apt-get install rsync screen -y
WORKDIR /minecraft WORKDIR /minecraft
COPY --from=build /minecraft . COPY --from=build /minecraft .

View File

@ -5,13 +5,11 @@
# MC version list # MC version list
declare -a mcversions=( declare -a mcversions=(
"1.12.2"
"1.16.5" "1.16.5"
) )
# Forge version dictionary (we only support one version per) # Forge version dictionary (we only support one version per)
declare -A forgeversions=( declare -A forgeversions=(
["1.12.2"]="14.23.5.2855"
["1.16.5"]="36.1.13" ["1.16.5"]="36.1.13"
) )