update
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 13s
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 31s
minecraft-build-minecraft / generate-changelogs (push) Successful in 11s
minecraft-build-minecraft / generate-build-info (push) Successful in 13s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 12s
minecraft-build-testing / Build and Push testing (push) Successful in 31s
minecraft-build-testing / generate-changelogs (push) Successful in 9s
minecraft-build-testing / generate-build-info (push) Successful in 10s

This commit is contained in:
2026-07-20 12:40:43 -07:00
parent ffceeb225c
commit f09eb49200
3 changed files with 32 additions and 9 deletions
+9
View File
@@ -7,6 +7,8 @@ MC_DIR=/mcserver
EULA_FILE=$MC_DIR/eula.txt EULA_FILE=$MC_DIR/eula.txt
EULA_MARKER=$MC_DIR/.eula_accepted EULA_MARKER=$MC_DIR/.eula_accepted
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/minecraft/server.properties
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
@@ -295,6 +297,13 @@ else
sleep infinity sleep infinity
fi fi
if [ -f $MC_DIR/server.properties ]; then
echo "INFO ! server.properties found ... moving on."
else
echo "WARNING ! server.properties missing ... downloading default file."
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
fi
echo "INFO ! Setting game port." echo "INFO ! Setting game port."
if [ -f $MC_DIR/server.properties ]; then if [ -f $MC_DIR/server.properties ]; then
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
+20 -1
View File
@@ -15,6 +15,9 @@ fi
EULA_FILE=$MC_DIR/eula.txt EULA_FILE=$MC_DIR/eula.txt
EULA_MARKER=$MC_DIR/.eula_accepted EULA_MARKER=$MC_DIR/.eula_accepted
SERVER_PROPERTIES=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/server.properties
START_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing/start.sh
VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar BUKKIT_INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
@@ -303,6 +306,13 @@ else
sleep infinity sleep infinity
fi fi
if [ -f $MC_DIR/server.properties ]; then
echo "INFO ! server.properties found ... moving on."
else
echo "WARNING ! server.properties missing ... downloading default file."
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_PROPERTIES -O $MC_DIR/server.properties
fi
echo "INFO ! Setting game port." echo "INFO ! Setting game port."
if [ -f $MC_DIR/server.properties ]; then if [ -f $MC_DIR/server.properties ]; then
sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
@@ -335,6 +345,14 @@ else
sleep infinity sleep infinity
fi fi
if [ -f $MC_DIR/start.sh ]; then
echo "INFO ! start.sh found ... moving on."
else
echo "WARNING ! start.sh missing ... downloading default file."
wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $MC_DIR/start.sh
chmod +x start.sh
fi
# Set permissions. # Set permissions.
chown 99:100 -R $MC_DIR chown 99:100 -R $MC_DIR
chmod 776 -R $MC_DIR chmod 776 -R $MC_DIR
@@ -345,6 +363,7 @@ sleep 1
echo " " echo " "
echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION" echo "INFO ! Starting Minecraft Server $MC_TYPE-$MC_VERSION"
cd $MC_DIR cd $MC_DIR
exec ./run-$MC_TYPE-$MC_VERSION.sh exec ./start.sh
# exec ./run-$MC_TYPE-$MC_VERSION.sh
exit exit
+3 -8
View File
@@ -2,8 +2,8 @@
# Copyright (c) 2020 fithwum # Copyright (c) 2020 fithwum
# All rights reserved # All rights reserved
cd /MCserver cd /mcserver
JAR=./MCserver-*.jar exec ./run-$MC_TYPE-$MC_VERSION.sh
# Check if a screen session is already running # Check if a screen session is already running
if screen -list | grep -q "mcserver"; then if screen -list | grep -q "mcserver"; then
@@ -11,10 +11,5 @@ if screen -list | grep -q "mcserver"; then
else else
# Start the Minecraft server in a detached screen session # Start the Minecraft server in a detached screen session
echo "INFO ! Starting Minecraft Server in a screen session." echo "INFO ! Starting Minecraft Server in a screen session."
screen -mS mcserver bash -c 'while true; do screen -mS mcserver bash -c ./run-$MC_TYPE-$MC_VERSION.sh
java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
if [ $? -eq 0 ]; then
break
fi
done'
fi fi