From a6bacef41a4b081c16283ee5cde885d5fd76683f Mon Sep 17 00:00:00 2001 From: fithwum Date: Fri, 27 Jan 2023 19:14:46 -0800 Subject: [PATCH] new versions --- 1.19.1/Dockerfile | 2 +- 1.19.2/Dockerfile | 32 +++++++++++ 1.19.2/files/Install_Script.sh | 100 +++++++++++++++++++++++++++++++++ 1.19.2/files/run.sh | 15 +++++ latest/files/Install_Script.sh | 6 +- latest/files/run.sh | 2 +- 6 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 1.19.2/Dockerfile create mode 100644 1.19.2/files/Install_Script.sh create mode 100644 1.19.2/files/run.sh diff --git a/1.19.1/Dockerfile b/1.19.1/Dockerfile index 75cb3dc..404e8aa 100644 --- a/1.19.1/Dockerfile +++ b/1.19.1/Dockerfile @@ -5,7 +5,7 @@ ENV ACCEPT_EULA="false" ENV GAME_PORT=25565 # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.19/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.19.1/files/Install_Script.sh # Install java-17 & Dependencies. RUN apt-get -y update \ diff --git a/1.19.2/Dockerfile b/1.19.2/Dockerfile new file mode 100644 index 0000000..2a25bf7 --- /dev/null +++ b/1.19.2/Dockerfile @@ -0,0 +1,32 @@ +FROM fithwum/debian-base:bullseye +LABEL maintainer "fithwum" + +ENV ACCEPT_EULA="false" +ENV GAME_PORT=25565 + +# URL's for files +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/1.19.2/files/Install_Script.sh + +# Install java-17 & Dependencies. +RUN apt-get -y update \ + && apt-get -y --fix-broken install \ + && apt-get install -y software-properties-common openjdk-17-jdk \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && update-ca-certificates -f; + +# Folder creation. +RUN mkdir -p /MCserver /MCtemp \ + && chmod 777 -R /MCserver /MCtemp \ + && chown 99:100 -R /MCserver /MCtemp +ADD "${INSTALL_SCRIPT}" /MCtemp +RUN chmod +x /MCtemp/Install_Script.sh + +# Directory where data is stored +VOLUME /MCserver + +# 25565 Default. +EXPOSE 25565/udp 25565/tcp + +# Run command +CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] diff --git a/1.19.2/files/Install_Script.sh b/1.19.2/files/Install_Script.sh new file mode 100644 index 0000000..d3b8af8 --- /dev/null +++ b/1.19.2/files/Install_Script.sh @@ -0,0 +1,100 @@ +#!/bin/bash +# Copyright (c) 2022 fithwum +# All rights reserved + +# Variables. +echo " " +echo "INFO ! Checking for latest Minecraft Server version." +MC_VERSION_OLD=1.19.1 +MC_VERSION=1.19.2 + +# Main install (Debian). +# Check for files in /MCserver and download if needed. +if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] + then + echo " " + echo "INFO ! MCserver_${MC_VERSION}.jar found starting now." + else + echo " " + echo "WARNING ! MCserver_${MC_VERSION}.jar is out of date/missing ... will download now." + echo " " + echo "INFO ! Cleaning old files." + mkdir /MCserver/old-server-versions/${MC_VERSION_OLD} + mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD} + mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar +fi + +sleep 1 + +# Looking for run_${MC_VERSION}.sh +if [ -e /MCserver/run_${MC_VERSION}.sh ] + then + echo " " + echo "INFO ! run_${MC_VERSION}.sh found ... will use existing file." + else + echo " " + echo "WARNING ! run_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} + wget --no-cache https://raw.githubusercontent.com/fithwum/minecraft/master/files/run.sh -O /MCserver/run_${MC_VERSION}.sh +fi + +sleep 1 + +# Check for EULA +if [ ! -f /MCserver/eula.txt ]; then + : +else + if [ "${ACCEPT_EULA}" == "false" ]; then + if grep -rq 'eula=true' /MCserver/eula.txt; then + sed -i '/eula=true/c\eula=false' /MCserver/eula.txt + fi + echo " " + echo "WARNING ! EULA not accepted, you must accept the EULA" + echo " to start the Server, putting server in sleep mode" + sleep infinity + fi +fi + +sleep 1 + +if [ ! -f /MCserver/eula.txt ]; then + echo " " + echo "WARNING ! EULA not found please stand by..." + sleep 5 +fi +if [ "${ACCEPT_EULA}" == "true" ]; then + if grep -rq 'eula=false' /MCserver/eula.txt; then + sed -i '/eula=false/c\eula=true' /MCserver/eula.txt + echo " " + echo "INFO ! EULA accepted, server restarting, please wait..." + sleep 1 + exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + exit 0 + fi +elif [ "${ACCEPT_EULA}" == "false" ]; then + echo " " + echo "WARNING ! EULA not accepted, you must accept the EULA" + echo " to start the Server, putting server in sleep mode" + sleep infinity +else + echo " " + echo "WARNING ! Something went wrong, please check EULA variable" +fi + +sleep 1 + +# Set permissions. +chown 99:100 -R /MCserver +chmod 777 -R /MCserver +chmod +x /MCserver/run_${MC_VERSION}.sh +chmod +x /MCserver/MCserver_${MC_VERSION}.jar + +sleep 1 + +# Run Minecraft server. +echo " " +echo "INFO ! Starting Minecraft Server ${MC_VERSION}" +exec /MCserver/run_${MC_VERSION}.sh --dataPath=/MCserver + +exit diff --git a/1.19.2/files/run.sh b/1.19.2/files/run.sh new file mode 100644 index 0000000..134a562 --- /dev/null +++ b/1.19.2/files/run.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# Copyright (c) 2022 fithwum +# All rights reserved + +MC_VERSION=1.19.2 + +cd /MCserver +JAR=./MCserver_${MC_VERSION}.jar + +while [ true ]; do + java -Xmx4G -Xms1024M -Xmn1G -jar $JAR nogui + if [ $? -eq 0 ]; then + break + fi +done diff --git a/latest/files/Install_Script.sh b/latest/files/Install_Script.sh index d3b8af8..4be3cef 100644 --- a/latest/files/Install_Script.sh +++ b/latest/files/Install_Script.sh @@ -5,8 +5,8 @@ # Variables. echo " " echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.1 -MC_VERSION=1.19.2 +MC_VERSION_OLD=1.19.2 +MC_VERSION=1.19.3 # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -22,7 +22,7 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] mkdir /MCserver/old-server-versions/${MC_VERSION_OLD} mv /MCserver/MCserver_${MC_VERSION_OLD}.jar /MCserver/old-server-versions/${MC_VERSION_OLD} mv /MCserver/run_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar + wget --no-cache https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar -O /MCserver/MCserver_${MC_VERSION}.jar fi sleep 1 diff --git a/latest/files/run.sh b/latest/files/run.sh index 134a562..520e7ca 100644 --- a/latest/files/run.sh +++ b/latest/files/run.sh @@ -2,7 +2,7 @@ # Copyright (c) 2022 fithwum # All rights reserved -MC_VERSION=1.19.2 +MC_VERSION=1.19.3 cd /MCserver JAR=./MCserver_${MC_VERSION}.jar