wip3

minecraft/.dockerignore

@@ -1 +0,0 @@
-worlds/

minecraft/Dockerfile

@@ -3,18 +3,18 @@ FROM ubuntu:24.04
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y wget openjdk-21-jre
 
-RUN groupadd -g 2002 me && useradd -u 2002 -g 2002 -m me
-USER me
-WORKDIR /home/me
+WORKDIR /root
 
 # from https://github.com/itzg/rcon-cli
-RUN wget -O rcon-cli.tar.gz https://github.com/itzg/rcon-cli/releases/download/1.6.9/rcon-cli_1.6.9_linux_amd64.tar.gz
+RUN wget -O rcon-cli.tar.gz https://github.com/itzg/rcon-cli/releases/download/1.7.0/rcon-cli_1.7.0_linux_amd64.tar.gz
 RUN tar xvf rcon-cli.tar.gz && rm rcon-cli.tar.gz
 
-# from https://www.minecraft.net/en-us/download/server (currently 1.21.4)
-RUN wget https://piston-data.mojang.com/v1/objects/4707d00eb834b446575d89a61a11b5d548d8c001/server.jar
+# from https://www.minecraft.net/en-us/download/server (currently 1.21.5)
+RUN wget https://piston-data.mojang.com/v1/objects/e6ec2f64e6080b9b5d9b471b291c33cc7f509733/server.jar
 
-COPY --chown=me:me eula.txt ./
-COPY --chown=me:me entry.sh ./
-COPY --chown=me:me server.properties ./
-COPY --chown=me:me ops.json ./
+COPY entry.sh ./
+COPY eula.txt ./
+COPY ops.json ./
+COPY server.properties ./
+
+CMD ["/bin/bash", "/root/entry.sh"]

minecraft/entry.sh

@@ -4,7 +4,7 @@ cleanup() {
     ./rcon-cli --password password stop
 }
 
-trap 'cleanup' TERM
+trap 'cleanup' SIGTERM SIGINT
 
 java -Xmx1024M -Xms1024M -jar server.jar nogui &
 wait $! # wait for SIGTERM

minecraft/server.default

@@ -20,7 +20,6 @@ hardcore=true
 hide-online-players=false
 initial-disabled-packs=
 initial-enabled-packs=vanilla
-level-name=worlds/main
 level-seed=
 level-type=minecraft\:normal
 max-chained-neighbor-updates=1000000