Update papermc, openjdk docker image is deprecated, switch to eclipse-temurin

This commit is contained in:
Sivert V. Sæther
2025-11-18 15:41:55 +01:00
parent 1b8b74628d
commit 90d6406472
2 changed files with 16 additions and 21 deletions

View File

@@ -1,15 +1,14 @@
FROM openjdk:17-slim FROM eclipse-temurin:21
ENV MC_VERSION="latest" \ ENV MC_VERSION="latest" \
PAPER_BUILD="latest" \
MC_RAM="4G" \ MC_RAM="4G" \
JAVA_OPTS="" JAVA_OPTS=""
# PAPER_BUILD="latest"
ADD papermc.sh . ADD papermc.sh .
RUN apt-get update \ RUN apt update && apt install -y jq && \
&& apt-get install -y wget \ apt clean && rm -rf /var/lib/apt/lists/* && \
&& apt-get install -y jq \ mkdir /papermc
&& mkdir /papermc
CMD ["sh", "./papermc.sh"] CMD ["sh", "./papermc.sh"]

View File

@@ -1,21 +1,18 @@
#!/bin/bash #!/bin/bash
cd papermc cd papermc
urlPrefix=https://papermc.io/api/v2/projects/paper urlPrefix=https://fill.papermc.io/v3/projects/paper
if [ ${MC_VERSION} = latest ]; then if [ ${MC_VERSION} = latest ]; then
MC_VERSION=$(wget -qO - $urlPrefix | jq -r '.versions[-1]') # "-r" is needed because the output has quotes otherwise MC_VERSION=$(curl -s $urlPrefix | jq -r '.versions | to_entries[0] | .value[0]')
fi fi
urlPrefix=${urlPrefix}/versions/${MC_VERSION} urlPrefix=${urlPrefix}/versions/${MC_VERSION}
if [ ${PAPER_BUILD} = latest ]; then DOWNLOAD_URL=$(
PAPER_BUILD=$(wget -qO - $urlPrefix | jq '.builds[-1]') curl -s "$urlPrefix/builds" |
fi jq -r 'first(.[] | select(.channel == "STABLE") | .downloads."server:default".url) // "null"')
JAR_NAME=papermc-${MC_VERSION}-${PAPER_BUILD}.jar rm -f *.jar
if [ ! -e ${JAR_NAME} ]; then curl -sO "$DOWNLOAD_URL"
rm -f *.jar if [ ! -e eula.txt ]; then
wget ${urlPrefix}/builds/${PAPER_BUILD}/downloads/paper-${MC_VERSION}-${PAPER_BUILD}.jar -O ${JAR_NAME} java -jar paper-*.jar
if [ ! -e eula.txt ]; then sed -i 's/false/true/g' eula.txt
java -jar ${JAR_NAME}
sed -i 's/false/true/g' eula.txt
fi
fi fi
#exec java -server -Xms${MC_RAM} -Xmx${MC_RAM} ${JAVA_OPTS} -jar ${JAR_NAME} nogui #exec java -server -Xms${MC_RAM} -Xmx${MC_RAM} ${JAVA_OPTS} -jar ${JAR_NAME} nogui
@@ -27,5 +24,4 @@ exec java -Xms${MC_RAM} -Xmx${MC_RAM} -XX:+UseG1GC \
-XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 \ -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 \
-XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 \ -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 \
-XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 \ -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 \
${JAVA_OPTS} -jar ${JAR_NAME} nogui ${JAVA_OPTS} -jar paper-*.jar nogui