updated scripts

Author: c3kay

Dockerfile

@@ -1,33 +1,26 @@
-# ------- BUILD LAYER --------- #
-FROM alpine AS build
+FROM amazoncorretto:21
 
 ARG mc_version
 ENV MC_VERSION=${mc_version}
 
-RUN apk add --no-cache curl jq
-
-COPY --chmod=755 install-paper.sh /tmp/install-paper.sh
-RUN /tmp/install-paper.sh
-
-# -------- APP LAYER ---------- #
-FROM amazoncorretto:21
-
 ENV PUID=1000
-RUN yum install wget shadow-utils -y && useradd -r -u ${PUID} mc
-
 ENV GOSU_VERSION=1.17
-COPY --chmod=755 install-gosu.sh /tmp/install-gosu.sh
-RUN /tmp/install-gosu.sh
-
-COPY --from=build --chmod=755 /tmp/server.jar /opt/minecraft/server.jar
 
 # https://docs.papermc.io/paper/aikars-flags
 ENV JAVA_FLAGS="-Dlog4j2.formatMsgNoLookups=true -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs -Dcom.mojang.eula.agree=true"
 ENV PAPERMC_FLAGS="--nojline"
 ENV MEM_SIZE="1G"
 
-WORKDIR /data
+VOLUME /opt/minecraft/data
+WORKDIR /opt/minecraft/data
+
+COPY --chmod=755 ./install-gosu.sh ./install-paper.sh ./docker-entrypoint.sh /usr/local/bin/
+
+RUN yum install -y curl wget jq shadow-utils && \
+    useradd -r -u ${PUID} mc && \
+    # mkdir -p /opt/minecraft && \
+    install-gosu.sh && \
+    install-paper.sh
 
-COPY --chmod=755 docker-entrypoint.sh /docker-entrypoint.sh
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["docker-entrypoint.sh"]
 CMD java -jar -Xms${MEM_SIZE} -Xmx${MEM_SIZE} ${JAVA_FLAGS} /opt/minecraft/server.jar ${PAPERMC_FLAGS} nogui

docker-entrypoint.sh

@@ -1,9 +1,10 @@
-#!/bin/sh
-set -eux
+#!/usr/bin/env sh
+set -e
 
 if [ -n "${PUID}" ] && [ ! "${PUID}" = "$(id mc -u)" ]; then
     usermod -o -u "$PUID" mc
     echo "UID of mc user: $(id mc -u)"
 fi
-chown -R mc /data
+
+chown -R mc /opt/minecraft
 exec gosu mc "$@"

install-gosu.sh

@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # https://github.com/tianon/gosu/blob/master/INSTALL.md
-set -eux
+set -e
+
 rpmArch="$(rpm --query --queryformat='%{ARCH}' rpm)";
 case "$rpmArch" in 
   aarch64) dpkgArch='arm64' ;; 
@@ -12,7 +13,9 @@ case "$rpmArch" in
   *) echo >&2 "error: unknown/unsupported architecture '$rpmArch'"; exit 1 ;; 
 esac;
 echo "$rpmArch -> $dpkgArch"
+
 wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch";
 chmod +x /usr/local/bin/gosu;
+
 gosu --version; 
 gosu nobody true

install-paper.sh

@@ -1,19 +1,16 @@
-#!/bin/sh
-# https://docs.papermc.io/misc/downloads-api
-set -eux
+#!/usr/bin/env sh
+set -e
 
-# get latest mc version if env var is not set
+# https://docs.papermc.io/misc/downloads-api
 : "${MC_VERSION:=$(curl -s 'https://api.papermc.io/v2/projects/paper' | jq -r '.versions[-1]')}"
+: "${BUILD:=$(curl -s "https://api.papermc.io/v2/projects/paper/versions/${MC_VERSION}/builds" | jq -r '.builds | map(select(.channel == "default") | .build) | .[-1]')}"
 
-# get latest stable build for mc version
-LATEST_BUILD=$(curl -s "https://api.papermc.io/v2/projects/paper/versions/${MC_VERSION}/builds" | \
-    jq -r '.builds | map(select(.channel == "default") | .build) | .[-1]')
-
-if [ "$LATEST_BUILD" != "null" ]; then
-    JAR_NAME="paper-${MC_VERSION}-${LATEST_BUILD}.jar"
-    PAPERMC_URL="https://api.papermc.io/v2/projects/paper/versions/${MC_VERSION}/builds/${LATEST_BUILD}/downloads/${JAR_NAME}"
-    curl -o /tmp/server.jar "$PAPERMC_URL"
+if [ "$BUILD" != "null" ]; then
+    JAR_NAME="paper-${MC_VERSION}-${BUILD}.jar"
+    PAPERMC_URL="https://api.papermc.io/v2/projects/paper/versions/${MC_VERSION}/builds/${BUILD}/downloads/${JAR_NAME}"
+    echo "$PAPERMC_URL"
+    curl -o /opt/minecraft/server.jar "$PAPERMC_URL"
 else
     echo "No stable build for version ${MC_VERSION} found!"
     exit 1
-fi
+fi