update to 1.21.4

amd64.Dockerfile

@@ -9,22 +9,26 @@ FROM ubuntu:rolling AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install qemu-user-static binfmt-support apt-utils -yqq && rm -rf /var/cache/apt/*
 
 # Use Ubuntu rolling version
-FROM --platform=linux/amd64 ubuntu:rolling
+FROM ubuntu:rolling
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

arm64v8.Dockerfile

@@ -15,19 +15,23 @@ FROM --platform=linux/arm64/v8 ubuntu:rolling
 COPY --from=builder /usr/bin/qemu-aarch64-static /usr/bin/
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

armv7.Dockerfile

@@ -15,19 +15,23 @@ FROM --platform=linux/arm/v7 ubuntu:rolling
 COPY --from=builder /usr/bin/qemu-arm-static /usr/bin/
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4t64 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4t64 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

ppc64le.Dockerfile

@@ -15,19 +15,23 @@ FROM --platform=linux/ppc64le ubuntu:rolling
 COPY --from=builder /usr/bin/qemu-ppc64le-static /usr/bin/
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

riscv64.Dockerfile

@@ -15,19 +15,23 @@ FROM --platform=linux/riscv64 ubuntu:rolling
 COPY --from=builder /usr/bin/qemu-riscv64-static /usr/bin/
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

s390x.Dockerfile

@@ -15,19 +15,23 @@ FROM --platform=linux/s390x ubuntu:rolling
 COPY --from=builder /usr/bin/qemu-s390x-static /usr/bin/
 
 # Fetch dependencies
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support nano -yqq && rm -rf /var/cache/apt/*
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install openjdk-21-jre-headless tzdata sudo curl unzip net-tools gawk openssl findutils pigz libcurl4 libc6 libcrypt1 apt-utils libcurl4-openssl-dev ca-certificates binfmt-support jq nano -yqq && rm -rf /var/cache/apt/*
 
 # Set port environment variable
 ENV Port=25565
 
 # Set Bedrock port environment variable
 ENV BedrockPort=19132
 
+# Set the UID and GID to map minecraft:minecraft to
+ENV Uid=""
+ENV Gud=""
+
 # Optional maximum memory Minecraft is allowed to use
 ENV MaxMemory=
 
 # Optional Paper Minecraft Version override
-ENV Version="1.21.3"
+ENV Version="1.21.4"
 
 # Optional Timezone
 ENV TZ="America/Denver"

start.sh

@@ -9,7 +9,16 @@ if [ "$(id -u)" = '0' ]; then
 
     if ! id minecraft >/dev/null 2>&1; then
         echo "Creating 'minecraft' user..."
-        useradd -m -r -s /bin/bash minecraft
+        if [ -n "$Uid" ]; then
+            echo "...with UID: $Uid"
+            Uid="-u $Uid"
+        fi
+
+        if [ -n "$Gid" ]; then
+            echo "...with GID: $Gid"
+            Gid="-g $Gid"
+        fi
+        useradd -m -r -s /bin/bash $Uid $Gid minecraft
     fi
 
     chown -R minecraft:minecraft /minecraft
@@ -154,15 +163,15 @@ if [ "$?" != 0 ]; then
     echo "Unable to connect to update website (internet connection may be down).  Skipping update ..."
 else
     # Get latest build
-    BuildJSON=$(curl --no-progress-meter -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" https://papermc.io/api/v2/projects/paper/versions/$Version)
-    Build=$(echo "$BuildJSON" | rev | cut -d, -f 1 | cut -d']' -f 2 | cut -d'[' -f 1 | rev)
+    Build=$(curl -s https://api.papermc.io/v2/projects/paper/versions/${Version}/builds | \
+        jq -r '.builds | map(select(.channel == "default") | .build) | .[-1]')
     Build=$(($Build + 0))
     if [[ $Build != 0 ]]; then
         echo "Latest paperclip build found: $Build"
         if [ -z "$QuietCurl" ]; then
-            curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o /minecraft/paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
+            curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o /minecraft/paperclip.jar "https://api.papermc.io/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
         else
-            curl --no-progress-meter -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o /minecraft/paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
+            curl --no-progress-meter -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o /minecraft/paperclip.jar "https://api.papermc.io/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar"
         fi
     else
         echo "Unable to retrieve latest Paper build (got result of $Build)"