refactor: modular init, add bedrock loader, dynamic java/healthcheck
Build dev image / build (push) Failing after 18m12s
Build dev image / build (push) Failing after 18m12s
- Split monolithic init into modular lib files under scripts/lib/
(common.sh, java.sh, server.sh, loaders/{vanilla,paper,fabric,forge,neoforge}.sh)
- Add bedrock loader: downloads from Minecraft Services API,
runs native binary with LD_LIBRARY_PATH, skips Java setup
- Add auto-detection for JAVA_VERSION from Mojang version manifest
(MC 1.20.5+ -> temurin@21, 1.17-1.20.4 -> temurin@17,
1.17 -> temurin@16, pre-1.17 -> temurin@8)
- Fix NEW_FORGE unbound variable when non-Forge loaders run
- Fix Fabric loader jq filter (-s slurp removed, null string check fixed)
- Fix Forge test detection (recursive find for forge-*-server.jar)
- Dynamic healthcheck: nc -z TCP 25565 for Java, nc -zu UDP 19132 for bedrock
- Add .gitea/workflows/build-dev.yml for dev branch CI builds
- Base image: debian:bookworm-slim (from ubuntu:noble)
- Add unzip, netcat-openbsd to Docker image
- Switch to shebangs, set -euo pipefail throughout
This commit is contained in:
@@ -0,0 +1,96 @@
|
||||
serverSelect() {
|
||||
mkdir -p /data/server
|
||||
cd /data/server || exit
|
||||
if [[ -f "server.jar" ]] || [[ -f "run.sh" ]] || [[ -f "bedrock_server" ]]; then
|
||||
echo "Found what appears to be a server, sending it"
|
||||
else
|
||||
case $MC_LOADER in
|
||||
vanilla)
|
||||
getVanilla
|
||||
;;
|
||||
paper)
|
||||
getPaper
|
||||
;;
|
||||
fabric)
|
||||
getFabric
|
||||
;;
|
||||
forge)
|
||||
getForge
|
||||
;;
|
||||
neoforge)
|
||||
getNeoForge
|
||||
;;
|
||||
bedrock)
|
||||
getBedrock
|
||||
;;
|
||||
*)
|
||||
echo "Server of type ${MC_LOADER} is not recognized."
|
||||
crash
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
buildCommand() {
|
||||
JAVA_ARGS="-Xms${XMS} -Xmx${XMX}"
|
||||
if [[ -n $ADD_ARGS ]]; then
|
||||
RUN_STRING="${ADD_ARGS} ${JAVA_ARGS} -jar ${JAR} nogui"
|
||||
else
|
||||
RUN_STRING="${JAVA_ARGS} -jar ${JAR} nogui"
|
||||
fi
|
||||
}
|
||||
|
||||
serverStart() {
|
||||
while true; do
|
||||
cd /data/server || exit
|
||||
if [[ ! -f "server.properties" ]]; then touch "server.properties"; fi
|
||||
|
||||
if [[ -f $JAR || -f "run.sh" || -f "bedrock_server" ]]; then
|
||||
echo -e "|_______________________________________________________|"
|
||||
echo -e "|##----------------- Server Starting -----------------##|"
|
||||
echo -e "|#| Minecraft Version: $MC_VERSION"
|
||||
echo -e "|#| "
|
||||
echo -e "|#| Loader Type: ${SERVER_TYPE:-$MC_LOADER}"
|
||||
echo -e "|#| Loader Version: $MC_LOADER_VERSION"
|
||||
echo -e "|#| "
|
||||
if [[ "$MC_LOADER" != "bedrock" ]]; then
|
||||
echo -e "|#| Java Version: $JAVA_VERSION"
|
||||
echo -e "|#| Jar: $JAR"
|
||||
echo -e "|#| Memory Allocated: "
|
||||
echo -e "|#| Xms: $XMS"
|
||||
echo -e "|#| Xmx: $XMX"
|
||||
echo -e "|#| Additional Args: ${ADD_ARGS:-"NONE"}"
|
||||
fi
|
||||
echo -e "|#| "
|
||||
echo -e "|#| Running as:"
|
||||
echo -e "|#| User: $PUID"
|
||||
echo -e "|#| Group: $PGID"
|
||||
echo -e "|#| "
|
||||
if [[ "$MC_LOADER" == "bedrock" ]]; then
|
||||
echo -e "|#| Run Command:"
|
||||
echo -e "|#| LD_LIBRARY_PATH=. ./bedrock_server"
|
||||
elif [[ ${NEW_FORGE:-false} != "true" ]]; then
|
||||
echo -e "|#| Run Command:"
|
||||
echo -e "|#| java $RUN_STRING"
|
||||
fi
|
||||
echo -e "|##---------------------------------------------------##|"
|
||||
echo -e "|-------------------------------------------------------|"
|
||||
echo -e " "
|
||||
serverInfoWrite
|
||||
newForge
|
||||
if [[ "$MC_LOADER" == "bedrock" ]]; then
|
||||
exec env LD_LIBRARY_PATH=. ./bedrock_server
|
||||
elif [[ "$MC_LOADER" == "neoforge" ]]; then
|
||||
exec java @user_jvm_args.txt @libraries/net/neoforged/neoforge/"${VER_LOADER}"/unix_args.txt "$@"
|
||||
elif [[ "$MC_LOADER" == "forge" ]] && [[ ${NEW_FORGE:-false} == "true" ]]; then
|
||||
exec java @user_jvm_args.txt @libraries/net/minecraftforge/forge/"$MC_VERSION"-"${VER_LOADER}"/unix_args.txt "$@"
|
||||
else
|
||||
echo "java $RUN_STRING"
|
||||
exec java $RUN_STRING
|
||||
fi
|
||||
else
|
||||
echo "Server Not Found."
|
||||
crash
|
||||
fi
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user