From 54ea7e5867683fa99e43409b618e2fcdb751472e Mon Sep 17 00:00:00 2001 From: fithwum Date: Wed, 8 Nov 2023 15:08:40 -0800 Subject: [PATCH] Major Update --- fabric/fabric-1.18.1/Dockerfile | 8 +- fabric/fabric-1.18.1/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.18.1/files/eula.txt | 3 - fabric/fabric-1.18.2/Dockerfile | 8 +- fabric/fabric-1.18.2/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.18.2/files/eula.txt | 3 - fabric/fabric-1.18/Dockerfile | 7 +- fabric/fabric-1.19.1/Dockerfile | 8 +- fabric/fabric-1.19.1/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.19.1/files/eula.txt | 3 - fabric/fabric-1.19.2/Dockerfile | 8 +- fabric/fabric-1.19.2/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.19.2/files/eula.txt | 3 - fabric/fabric-1.19.3/Dockerfile | 8 +- fabric/fabric-1.19.3/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.19.3/files/eula.txt | 3 - fabric/fabric-1.19.4/Dockerfile | 8 +- fabric/fabric-1.19.4/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.19.4/files/eula.txt | 3 - fabric/fabric-1.19/Dockerfile | 8 +- fabric/fabric-1.19/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.19/files/eula.txt | 3 - fabric/fabric-1.20.1/Dockerfile | 8 +- fabric/fabric-1.20.1/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.20.1/files/eula.txt | 3 - fabric/fabric-1.20.2/Dockerfile | 8 +- fabric/fabric-1.20.2/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.20.2/files/eula.txt | 3 - fabric/fabric-1.20/Dockerfile | 8 +- fabric/fabric-1.20/files/Install_Script.sh | 98 ----------------- fabric/fabric-1.20/files/eula.txt | 3 - .../Install_Script_Fabric.sh | 1 - .../Install_Script_Vanilla.sh | 20 ++-- stable/1.10.1/Dockerfile | 9 +- stable/1.10.1/files/Install_Script.sh | 101 ----------------- stable/1.10.2/Dockerfile | 9 +- stable/1.10.2/files/Install_Script.sh | 101 ----------------- stable/1.10/Dockerfile | 8 +- stable/1.10/files/Install_Script.sh | 101 ----------------- stable/1.11.1/Dockerfile | 9 +- stable/1.11.1/files/Install_Script.sh | 101 ----------------- stable/1.11.2/Dockerfile | 9 +- stable/1.11.2/files/Install_Script.sh | 101 ----------------- stable/1.11/Dockerfile | 9 +- stable/1.11/files/Install_Script.sh | 101 ----------------- stable/1.12.1/Dockerfile | 9 +- stable/1.12.1/files/Install_Script.sh | 101 ----------------- stable/1.12.2/Dockerfile | 9 +- stable/1.12.2/files/Install_Script.sh | 102 ------------------ stable/1.12/Dockerfile | 9 +- stable/1.13.1/Dockerfile | 9 +- stable/1.13.1/files/Install_Script.sh | 101 ----------------- stable/1.13.2/Dockerfile | 9 +- stable/1.13.2/files/Install_Script.sh | 101 ----------------- stable/1.13/Dockerfile | 9 +- stable/1.13/files/Install_Script.sh | 101 ----------------- stable/1.14.1/Dockerfile | 9 +- stable/1.14.1/files/Install_Script.sh | 101 ----------------- stable/1.14.2/Dockerfile | 9 +- stable/1.14.2/files/Install_Script.sh | 101 ----------------- stable/1.14.3/Dockerfile | 9 +- stable/1.14.3/files/Install_Script.sh | 101 ----------------- stable/1.14.4/Dockerfile | 9 +- stable/1.14.4/files/Install_Script.sh | 101 ----------------- stable/1.14/Dockerfile | 9 +- stable/1.14/files/Install_Script.sh | 101 ----------------- stable/1.15.1/Dockerfile | 9 +- stable/1.15.1/files/Install_Script.sh | 101 ----------------- stable/1.15.2/Dockerfile | 9 +- stable/1.15.2/files/Install_Script.sh | 101 ----------------- stable/1.15/Dockerfile | 9 +- stable/1.15/files/Install_Script.sh | 101 ----------------- stable/1.16.1/Dockerfile | 9 +- stable/1.16.1/files/Install_Script.sh | 101 ----------------- stable/1.16.2/Dockerfile | 9 +- stable/1.16.2/files/Install_Script.sh | 101 ----------------- stable/1.16.3/Dockerfile | 9 +- stable/1.16.3/files/Install_Script.sh | 101 ----------------- stable/1.16.4/Dockerfile | 9 +- stable/1.16.4/files/Install_Script.sh | 101 ----------------- stable/1.16.5/Dockerfile | 9 +- stable/1.16.5/files/Install_Script.sh | 101 ----------------- stable/1.16/Dockerfile | 9 +- stable/1.16/files/Install_Script.sh | 101 ----------------- stable/1.17.1/Dockerfile | 9 +- stable/1.17.1/files/Install_Script.sh | 101 ----------------- stable/1.17/Dockerfile | 9 +- stable/1.17/files/Install_Script.sh | 101 ----------------- stable/1.18.1/Dockerfile | 9 +- stable/1.18.1/files/Install_Script.sh | 101 ----------------- stable/1.18.2/Dockerfile | 9 +- stable/1.18.2/files/Install_Script.sh | 101 ----------------- stable/1.18/Dockerfile | 9 +- stable/1.18/files/Install_Script.sh | 101 ----------------- stable/1.19.1/Dockerfile | 9 +- stable/1.19.1/files/Install_Script.sh | 101 ----------------- stable/1.19.2/Dockerfile | 9 +- stable/1.19.2/files/Install_Script.sh | 101 ----------------- stable/1.19.3/Dockerfile | 11 +- stable/1.19.3/files/Install_Script.sh | 101 ----------------- stable/1.19.4/Dockerfile | 11 +- stable/1.19.4/files/Install_Script.sh | 101 ----------------- stable/1.19/Dockerfile | 9 +- stable/1.19/files/Install_Script.sh | 101 ----------------- stable/1.20.1/Dockerfile | 11 +- stable/1.20.1/files/Install_Script.sh | 102 ------------------ stable/1.20.2/Dockerfile | 11 +- stable/1.20.2/files/Install_Script.sh | 102 ------------------ stable/1.20/Dockerfile | 11 +- stable/1.20/files/Install_Script.sh | 101 ----------------- 110 files changed, 311 insertions(+), 5008 deletions(-) delete mode 100644 fabric/fabric-1.18.1/files/Install_Script.sh delete mode 100644 fabric/fabric-1.18.1/files/eula.txt delete mode 100644 fabric/fabric-1.18.2/files/Install_Script.sh delete mode 100644 fabric/fabric-1.18.2/files/eula.txt delete mode 100644 fabric/fabric-1.19.1/files/Install_Script.sh delete mode 100644 fabric/fabric-1.19.1/files/eula.txt delete mode 100644 fabric/fabric-1.19.2/files/Install_Script.sh delete mode 100644 fabric/fabric-1.19.2/files/eula.txt delete mode 100644 fabric/fabric-1.19.3/files/Install_Script.sh delete mode 100644 fabric/fabric-1.19.3/files/eula.txt delete mode 100644 fabric/fabric-1.19.4/files/Install_Script.sh delete mode 100644 fabric/fabric-1.19.4/files/eula.txt delete mode 100644 fabric/fabric-1.19/files/Install_Script.sh delete mode 100644 fabric/fabric-1.19/files/eula.txt delete mode 100644 fabric/fabric-1.20.1/files/Install_Script.sh delete mode 100644 fabric/fabric-1.20.1/files/eula.txt delete mode 100644 fabric/fabric-1.20.2/files/Install_Script.sh delete mode 100644 fabric/fabric-1.20.2/files/eula.txt delete mode 100644 fabric/fabric-1.20/files/Install_Script.sh delete mode 100644 fabric/fabric-1.20/files/eula.txt rename fabric/fabric-1.18/files/Install_Script.sh => files/Install_Script_Fabric.sh (97%) rename stable/1.12/files/Install_Script.sh => files/Install_Script_Vanilla.sh (78%) delete mode 100644 stable/1.10.1/files/Install_Script.sh delete mode 100644 stable/1.10.2/files/Install_Script.sh delete mode 100644 stable/1.10/files/Install_Script.sh delete mode 100644 stable/1.11.1/files/Install_Script.sh delete mode 100644 stable/1.11.2/files/Install_Script.sh delete mode 100644 stable/1.11/files/Install_Script.sh delete mode 100644 stable/1.12.1/files/Install_Script.sh delete mode 100644 stable/1.12.2/files/Install_Script.sh delete mode 100644 stable/1.13.1/files/Install_Script.sh delete mode 100644 stable/1.13.2/files/Install_Script.sh delete mode 100644 stable/1.13/files/Install_Script.sh delete mode 100644 stable/1.14.1/files/Install_Script.sh delete mode 100644 stable/1.14.2/files/Install_Script.sh delete mode 100644 stable/1.14.3/files/Install_Script.sh delete mode 100644 stable/1.14.4/files/Install_Script.sh delete mode 100644 stable/1.14/files/Install_Script.sh delete mode 100644 stable/1.15.1/files/Install_Script.sh delete mode 100644 stable/1.15.2/files/Install_Script.sh delete mode 100644 stable/1.15/files/Install_Script.sh delete mode 100644 stable/1.16.1/files/Install_Script.sh delete mode 100644 stable/1.16.2/files/Install_Script.sh delete mode 100644 stable/1.16.3/files/Install_Script.sh delete mode 100644 stable/1.16.4/files/Install_Script.sh delete mode 100644 stable/1.16.5/files/Install_Script.sh delete mode 100644 stable/1.16/files/Install_Script.sh delete mode 100644 stable/1.17.1/files/Install_Script.sh delete mode 100644 stable/1.17/files/Install_Script.sh delete mode 100644 stable/1.18.1/files/Install_Script.sh delete mode 100644 stable/1.18.2/files/Install_Script.sh delete mode 100644 stable/1.18/files/Install_Script.sh delete mode 100644 stable/1.19.1/files/Install_Script.sh delete mode 100644 stable/1.19.2/files/Install_Script.sh delete mode 100644 stable/1.19.3/files/Install_Script.sh delete mode 100644 stable/1.19.4/files/Install_Script.sh delete mode 100644 stable/1.19/files/Install_Script.sh delete mode 100644 stable/1.20.1/files/Install_Script.sh delete mode 100644 stable/1.20.2/files/Install_Script.sh delete mode 100644 stable/1.20/files/Install_Script.sh diff --git a/fabric/fabric-1.18.1/Dockerfile b/fabric/fabric-1.18.1/Dockerfile index 6df84fb..92bb593 100644 --- a/fabric/fabric-1.18.1/Dockerfile +++ b/fabric/fabric-1.18.1/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.18.1" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.18.1/files/Install_Script.sh b/fabric/fabric-1.18.1/files/Install_Script.sh deleted file mode 100644 index 96a0cab..0000000 --- a/fabric/fabric-1.18.1/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.18.1 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.18.1/files/eula.txt b/fabric/fabric-1.18.1/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.18.1/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.18.2/Dockerfile b/fabric/fabric-1.18.2/Dockerfile index de82848..0b16df2 100644 --- a/fabric/fabric-1.18.2/Dockerfile +++ b/fabric/fabric-1.18.2/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.18.2" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.18.2/files/Install_Script.sh b/fabric/fabric-1.18.2/files/Install_Script.sh deleted file mode 100644 index f8a5658..0000000 --- a/fabric/fabric-1.18.2/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18.1 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.18.2 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.18.2/files/eula.txt b/fabric/fabric-1.18.2/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.18.2/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.18/Dockerfile b/fabric/fabric-1.18/Dockerfile index da18102..d980fcb 100644 --- a/fabric/fabric-1.18/Dockerfile +++ b/fabric/fabric-1.18/Dockerfile @@ -1,14 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" ENV MC_VERSION="1.18" ENV FABRIC_VERSION="" -ENV INSTALLER_VERSION="0.11.2" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.18/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -32,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19.1/Dockerfile b/fabric/fabric-1.19.1/Dockerfile index 8c645c4..bd4f7d4 100644 --- a/fabric/fabric-1.19.1/Dockerfile +++ b/fabric/fabric-1.19.1/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.1" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.19.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19.1/files/Install_Script.sh b/fabric/fabric-1.19.1/files/Install_Script.sh deleted file mode 100644 index efb8f01..0000000 --- a/fabric/fabric-1.19.1/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.19.1 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.19.1/files/eula.txt b/fabric/fabric-1.19.1/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.19.1/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.19.2/Dockerfile b/fabric/fabric-1.19.2/Dockerfile index 7a69b47..fc6098c 100644 --- a/fabric/fabric-1.19.2/Dockerfile +++ b/fabric/fabric-1.19.2/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.2" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.19.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19.2/files/Install_Script.sh b/fabric/fabric-1.19.2/files/Install_Script.sh deleted file mode 100644 index c8b79b0..0000000 --- a/fabric/fabric-1.19.2/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.1 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.19.2 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.19.2/files/eula.txt b/fabric/fabric-1.19.2/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.19.2/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.19.3/Dockerfile b/fabric/fabric-1.19.3/Dockerfile index d61e57b..9379463 100644 --- a/fabric/fabric-1.19.3/Dockerfile +++ b/fabric/fabric-1.19.3/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.3" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.19.3/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19.3/files/Install_Script.sh b/fabric/fabric-1.19.3/files/Install_Script.sh deleted file mode 100644 index 9711b81..0000000 --- a/fabric/fabric-1.19.3/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.2 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.19.3 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.19.3/files/eula.txt b/fabric/fabric-1.19.3/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.19.3/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.19.4/Dockerfile b/fabric/fabric-1.19.4/Dockerfile index ae6bace..9d1c486 100644 --- a/fabric/fabric-1.19.4/Dockerfile +++ b/fabric/fabric-1.19.4/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.4" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.19.4/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19.4/files/Install_Script.sh b/fabric/fabric-1.19.4/files/Install_Script.sh deleted file mode 100644 index e10be24..0000000 --- a/fabric/fabric-1.19.4/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.3 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.19.4 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.19.4/files/eula.txt b/fabric/fabric-1.19.4/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.19.4/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.19/Dockerfile b/fabric/fabric-1.19/Dockerfile index 34d35f6..383211a 100644 --- a/fabric/fabric-1.19/Dockerfile +++ b/fabric/fabric-1.19/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.19" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.19/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.19/files/Install_Script.sh b/fabric/fabric-1.19/files/Install_Script.sh deleted file mode 100644 index 1ec2c8b..0000000 --- a/fabric/fabric-1.19/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18.2 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.19 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-fabric_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.19/files/eula.txt b/fabric/fabric-1.19/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.19/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.20.1/Dockerfile b/fabric/fabric-1.20.1/Dockerfile index 437ac1e..3bc3a1f 100644 --- a/fabric/fabric-1.20.1/Dockerfile +++ b/fabric/fabric-1.20.1/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.20.1" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.20.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.20.1/files/Install_Script.sh b/fabric/fabric-1.20.1/files/Install_Script.sh deleted file mode 100644 index f670be7..0000000 --- a/fabric/fabric-1.20.1/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.20 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.20.1 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.20.1/files/eula.txt b/fabric/fabric-1.20.1/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.20.1/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.20.2/Dockerfile b/fabric/fabric-1.20.2/Dockerfile index 37604b3..a1d271e 100644 --- a/fabric/fabric-1.20.2/Dockerfile +++ b/fabric/fabric-1.20.2/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.20.2" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.20.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.20.2/files/Install_Script.sh b/fabric/fabric-1.20.2/files/Install_Script.sh deleted file mode 100644 index ff51754..0000000 --- a/fabric/fabric-1.20.2/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.20.1 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.20.2 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.20.2/files/eula.txt b/fabric/fabric-1.20.2/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.20.2/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.20/Dockerfile b/fabric/fabric-1.20/Dockerfile index 24d17b8..918586e 100644 --- a/fabric/fabric-1.20/Dockerfile +++ b/fabric/fabric-1.20/Dockerfile @@ -1,11 +1,15 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" +# Environment Variables ENV ACCEPT_EULA="false" ENV GAME_PORT="25565" +ENV MC_VERSION="1.20" +ENV FABRIC_VERSION="" +ENV INSTALLER_VERSION="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-1.20/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/Install_Script_Fabric.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +33,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Fabric.sh" ] diff --git a/fabric/fabric-1.20/files/Install_Script.sh b/fabric/fabric-1.20/files/Install_Script.sh deleted file mode 100644 index 2c056d7..0000000 --- a/fabric/fabric-1.20/files/Install_Script.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Display setup -export DISPLAY=0 - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.4 -FABRIC_VERSION_OLD=0.14.22 -MC_VERSION=1.20 -FABRIC_VERSION=0.14.24 -INSTALLER_VERSION=0.11.2 - -SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/${MC_VERSION}/${FABRIC_VERSION}/${INSTALLER_VERSION}/server/jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-fabric.sh - -EULA_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/fabric-${MC_VERSION}/files/eula.txt - -# Main install (Debian). -# Check for files in /MCserver and download if needed. -if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] - then - echo " " - echo "INFO ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar found starting now." - else - echo " " - echo "WARNING ! fabric-${MC_VERSION}-${FABRIC_VERSION}.jar is out of date/missing ... will download now." - echo " " - echo "INFO ! Cleaning old files." - mkdir /MCserver/old-server-versions - mv /MCserver/fabric-${MC_VERSION_OLD}-${FABRIC_VERSION}.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION_OLD}.jar /MCserver/old-server-versions/ - wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar -fi - -sleep 1 - -# Looking for run_${MC_VERSION}.sh -if [ -e /MCserver/run-fabric_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-fabric_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-fabric_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-fabric_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/ - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-fabric_${MC_VERSION}.sh -fi - -# Check for needed files -if [ -e /MCserver/eula.txt ] - then - echo " " - echo "INFO ! eula.txt found ... will use existing file." - else - echo " " - echo "WARNING ! eula.txt is missing ... will download now." - wget --no-cache ${EULA_FILE} -O /MCserver/eula.txt -fi - -if [ -e /MCserver/ops.json ] - then - echo " " - echo "INFO ! ops.json found ... will use existing file." - else - echo " " - echo "WARNING ! ops.json is missing ... will download now." - wget --no-cache ${OPS_FILE} -O /MCserver/ops.json -fi - -if [ -e /MCserver/whitelist.json ] - then - echo " " - echo "INFO ! whitelist.json found ... will use existing file." - else - echo " " - echo "WARNING ! whitelist.json is missing ... will download now." - wget --no-cache ${WHITELIST_FILE} -O /MCserver/whitelist.json -fi - -sleep 1 - -# Set permissions. -chown 99:100 -R /MCserver -chmod 777 -R /MCserver -chmod +x /MCserver/run-fabric_${MC_VERSION}.sh - -sleep 1 - -# Run Minecraft server. -echo " " -echo "INFO ! Starting Minecraft Server ${MC_VERSION}" -exec /MCserver/run-fabric_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/fabric/fabric-1.20/files/eula.txt b/fabric/fabric-1.20/files/eula.txt deleted file mode 100644 index 9721c7a..0000000 --- a/fabric/fabric-1.20/files/eula.txt +++ /dev/null @@ -1,3 +0,0 @@ -#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). -#Mon Jul 13 15:34:07 PDT 2020 -eula=true diff --git a/fabric/fabric-1.18/files/Install_Script.sh b/files/Install_Script_Fabric.sh similarity index 97% rename from fabric/fabric-1.18/files/Install_Script.sh rename to files/Install_Script_Fabric.sh index 761d1ae..5feac12 100644 --- a/fabric/fabric-1.18/files/Install_Script.sh +++ b/files/Install_Script_Fabric.sh @@ -22,7 +22,6 @@ if [ -e /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar ] echo "INFO ! Cleaning old files." mkdir /MCserver/old-server-versions mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/ - mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/ wget --no-cache ${SERVER_FILE} -O /MCserver/fabric-${MC_VERSION}-${FABRIC_VERSION}.jar fi diff --git a/stable/1.12/files/Install_Script.sh b/files/Install_Script_Vanilla.sh similarity index 78% rename from stable/1.12/files/Install_Script.sh rename to files/Install_Script_Vanilla.sh index 4a87e83..ed5f65e 100644 --- a/stable/1.12/files/Install_Script.sh +++ b/files/Install_Script_Vanilla.sh @@ -2,13 +2,11 @@ # Copyright (c) 2022 fithwum # All rights reserved -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.11.2 -MC_VERSION=1.12 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh +# Display setup +export DISPLAY=0 + +# Main Install Links +MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/files/run-vanilla.sh # Main install (Debian). # Check for files in /MCserver and download if needed. @@ -21,9 +19,9 @@ if [ -e /MCserver/MCserver_${MC_VERSION}.jar ] 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} + mkdir /MCserver/old-server-versions/ + mv /MCserver/MCserver_*.jar /MCserver/old-server-versions/ + mv /MCserver/run-vanilla_*.sh /MCserver/old-server-versions/ wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar fi @@ -36,7 +34,7 @@ if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." else echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." + echo "WARNING ! run-vanilla.sh is out of date/missing ... will download now." wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${MC_VERSION}.sh fi diff --git a/stable/1.10.1/Dockerfile b/stable/1.10.1/Dockerfile index 6949799..365b93d 100644 --- a/stable/1.10.1/Dockerfile +++ b/stable/1.10.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.10.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/cb4c6f9f51a845b09a8861cdbe0eea3ff6996dee/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.10.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.10.1/files/Install_Script.sh b/stable/1.10.1/files/Install_Script.sh deleted file mode 100644 index 3a90cbb..0000000 --- a/stable/1.10.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.10 -MC_VERSION=1.10.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/cb4c6f9f51a845b09a8861cdbe0eea3ff6996dee/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.10.2/Dockerfile b/stable/1.10.2/Dockerfile index b69b2e9..80e5655 100644 --- a/stable/1.10.2/Dockerfile +++ b/stable/1.10.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.10.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.10.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.10.2/files/Install_Script.sh b/stable/1.10.2/files/Install_Script.sh deleted file mode 100644 index 7548604..0000000 --- a/stable/1.10.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.10.1 -MC_VERSION=1.10.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3d501b23df53c548254f5e3f66492d178a48db63/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.10/Dockerfile b/stable/1.10/Dockerfile index 70834d7..2f8c578 100644 --- a/stable/1.10/Dockerfile +++ b/stable/1.10/Dockerfile @@ -2,10 +2,12 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.10" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/a96617ffdf5dabbb718ab11a9a68e50545fc5bee/server.jar" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.10/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +31,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.10/files/Install_Script.sh b/stable/1.10/files/Install_Script.sh deleted file mode 100644 index 2baf136..0000000 --- a/stable/1.10/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.9.4 -MC_VERSION=1.10 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a96617ffdf5dabbb718ab11a9a68e50545fc5bee/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.11.1/Dockerfile b/stable/1.11.1/Dockerfile index d674891..31fbbb7 100644 --- a/stable/1.11.1/Dockerfile +++ b/stable/1.11.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.11.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/1f97bd101e508d7b52b3d6a7879223b000b5eba0/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.11.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.11.1/files/Install_Script.sh b/stable/1.11.1/files/Install_Script.sh deleted file mode 100644 index 1b8fc63..0000000 --- a/stable/1.11.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.11 -MC_VERSION=1.11.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/1f97bd101e508d7b52b3d6a7879223b000b5eba0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.11.2/Dockerfile b/stable/1.11.2/Dockerfile index 3c37fdd..433b749 100644 --- a/stable/1.11.2/Dockerfile +++ b/stable/1.11.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.11.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.11.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.11.2/files/Install_Script.sh b/stable/1.11.2/files/Install_Script.sh deleted file mode 100644 index 4b40b15..0000000 --- a/stable/1.11.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.11.1 -MC_VERSION=1.11.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.11/Dockerfile b/stable/1.11/Dockerfile index b459995..7c4452b 100644 --- a/stable/1.11/Dockerfile +++ b/stable/1.11/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.11" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/48820c84cb1ed502cb5b2fe23b8153d5e4fa61c0/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.11/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.11/files/Install_Script.sh b/stable/1.11/files/Install_Script.sh deleted file mode 100644 index e684560..0000000 --- a/stable/1.11/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.10.2 -MC_VERSION=1.11 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/48820c84cb1ed502cb5b2fe23b8153d5e4fa61c0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.12.1/Dockerfile b/stable/1.12.1/Dockerfile index 3c556b5..fa62d19 100644 --- a/stable/1.12.1/Dockerfile +++ b/stable/1.12.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.12.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.12.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.12.1/files/Install_Script.sh b/stable/1.12.1/files/Install_Script.sh deleted file mode 100644 index 324ad11..0000000 --- a/stable/1.12.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.12 -MC_VERSION=1.12.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.12.2/Dockerfile b/stable/1.12.2/Dockerfile index adc2c75..9b78614 100644 --- a/stable/1.12.2/Dockerfile +++ b/stable/1.12.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.12.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.12.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.12.2/files/Install_Script.sh b/stable/1.12.2/files/Install_Script.sh deleted file mode 100644 index 91ea3a6..0000000 --- a/stable/1.12.2/files/Install_Script.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.12.1 -MC_VERSION=1.12.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - mv /MCserver/run-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.12/Dockerfile b/stable/1.12/Dockerfile index e6deed3..eac6d80 100644 --- a/stable/1.12/Dockerfile +++ b/stable/1.12/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.12" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.12/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.13.1/Dockerfile b/stable/1.13.1/Dockerfile index d5fc3a9..4221e75 100644 --- a/stable/1.13.1/Dockerfile +++ b/stable/1.13.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.13.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/fe123682e9cb30031eae351764f653500b7396c9/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.13.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.13.1/files/Install_Script.sh b/stable/1.13.1/files/Install_Script.sh deleted file mode 100644 index 9ee62d9..0000000 --- a/stable/1.13.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.13 -MC_VERSION=1.13.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/fe123682e9cb30031eae351764f653500b7396c9/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.13.2/Dockerfile b/stable/1.13.2/Dockerfile index 0a94031..1974a0d 100644 --- a/stable/1.13.2/Dockerfile +++ b/stable/1.13.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.13.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.13.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.13.2/files/Install_Script.sh b/stable/1.13.2/files/Install_Script.sh deleted file mode 100644 index 37af752..0000000 --- a/stable/1.13.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.13.1 -MC_VERSION=1.13.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.13/Dockerfile b/stable/1.13/Dockerfile index 4671ee1..73534c3 100644 --- a/stable/1.13/Dockerfile +++ b/stable/1.13/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.13" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.13/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.13/files/Install_Script.sh b/stable/1.13/files/Install_Script.sh deleted file mode 100644 index d3c29df..0000000 --- a/stable/1.13/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.12.2 -MC_VERSION=1.13 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0caafb8438ebd206f99930cfaecfa6c9a13dca0/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.14.1/Dockerfile b/stable/1.14.1/Dockerfile index 42f73b6..e922c28 100644 --- a/stable/1.14.1/Dockerfile +++ b/stable/1.14.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.14.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/ed76d597a44c5266be2a7fcd77a8270f1f0bc118/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.14.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.14.1/files/Install_Script.sh b/stable/1.14.1/files/Install_Script.sh deleted file mode 100644 index 4888816..0000000 --- a/stable/1.14.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.14 -MC_VERSION=1.14.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/ed76d597a44c5266be2a7fcd77a8270f1f0bc118/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.14.2/Dockerfile b/stable/1.14.2/Dockerfile index 27a704d..3bf9067 100644 --- a/stable/1.14.2/Dockerfile +++ b/stable/1.14.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.14.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.14.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.14.2/files/Install_Script.sh b/stable/1.14.2/files/Install_Script.sh deleted file mode 100644 index 5aff5af..0000000 --- a/stable/1.14.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.14.1 -MC_VERSION=1.14.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/808be3869e2ca6b62378f9f4b33c946621620019/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.14.3/Dockerfile b/stable/1.14.3/Dockerfile index d600c7e..f61faae 100644 --- a/stable/1.14.3/Dockerfile +++ b/stable/1.14.3/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.14.3" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.14.3/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.14.3/files/Install_Script.sh b/stable/1.14.3/files/Install_Script.sh deleted file mode 100644 index d16b6cf..0000000 --- a/stable/1.14.3/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.14.2 -MC_VERSION=1.14.3 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/d0d0fe2b1dc6ab4c65554cb734270872b72dadd6/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.14.4/Dockerfile b/stable/1.14.4/Dockerfile index d1dc4a1..3fcac87 100644 --- a/stable/1.14.4/Dockerfile +++ b/stable/1.14.4/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.14.4" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.14.4/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.14.4/files/Install_Script.sh b/stable/1.14.4/files/Install_Script.sh deleted file mode 100644 index 50e91ec..0000000 --- a/stable/1.14.4/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.14.3 -MC_VERSION=1.14.4 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.14/Dockerfile b/stable/1.14/Dockerfile index 14de893..c15240e 100644 --- a/stable/1.14/Dockerfile +++ b/stable/1.14/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.14" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.14/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.14/files/Install_Script.sh b/stable/1.14/files/Install_Script.sh deleted file mode 100644 index 3ba1dbe..0000000 --- a/stable/1.14/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.13.2 -MC_VERSION=1.14 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f1a0073671057f01aa843443fef34330281333ce/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.15.1/Dockerfile b/stable/1.15.1/Dockerfile index 6ac54a9..27c8e64 100644 --- a/stable/1.15.1/Dockerfile +++ b/stable/1.15.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.15.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/4d1826eebac84847c71a77f9349cc22afd0cf0a1/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.15.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.15.1/files/Install_Script.sh b/stable/1.15.1/files/Install_Script.sh deleted file mode 100644 index 140f7a4..0000000 --- a/stable/1.15.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.15 -MC_VERSION=1.15.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/4d1826eebac84847c71a77f9349cc22afd0cf0a1/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.15.2/Dockerfile b/stable/1.15.2/Dockerfile index 6ac9b65..b40788a 100644 --- a/stable/1.15.2/Dockerfile +++ b/stable/1.15.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.15.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.15.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.15.2/files/Install_Script.sh b/stable/1.15.2/files/Install_Script.sh deleted file mode 100644 index f414f33..0000000 --- a/stable/1.15.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.15.1 -MC_VERSION=1.15.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.15/Dockerfile b/stable/1.15/Dockerfile index e074dfe..79e18f0 100644 --- a/stable/1.15/Dockerfile +++ b/stable/1.15/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.15" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/e9f105b3c5c7e85c7b445249a93362a22f62442d/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.15/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.15/files/Install_Script.sh b/stable/1.15/files/Install_Script.sh deleted file mode 100644 index 7cf8e17..0000000 --- a/stable/1.15/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.14.4 -MC_VERSION=1.15 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/e9f105b3c5c7e85c7b445249a93362a22f62442d/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16.1/Dockerfile b/stable/1.16.1/Dockerfile index cd14023..d735cc6 100644 --- a/stable/1.16.1/Dockerfile +++ b/stable/1.16.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16.1/files/Install_Script.sh b/stable/1.16.1/files/Install_Script.sh deleted file mode 100644 index c6a49d7..0000000 --- a/stable/1.16.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16 -MC_VERSION=1.16.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16.2/Dockerfile b/stable/1.16.2/Dockerfile index d80b5e3..c26c12a 100644 --- a/stable/1.16.2/Dockerfile +++ b/stable/1.16.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16.2/files/Install_Script.sh b/stable/1.16.2/files/Install_Script.sh deleted file mode 100644 index 02aa6b1..0000000 --- a/stable/1.16.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16.1 -MC_VERSION=1.16.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16.3/Dockerfile b/stable/1.16.3/Dockerfile index fb03d2a..1ebdd56 100644 --- a/stable/1.16.3/Dockerfile +++ b/stable/1.16.3/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16.3" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16.3/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16.3/files/Install_Script.sh b/stable/1.16.3/files/Install_Script.sh deleted file mode 100644 index d1644a6..0000000 --- a/stable/1.16.3/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16.2 -MC_VERSION=1.16.3 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16.4/Dockerfile b/stable/1.16.4/Dockerfile index 61ea595..e844d13 100644 --- a/stable/1.16.4/Dockerfile +++ b/stable/1.16.4/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16.4" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16.4/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16.4/files/Install_Script.sh b/stable/1.16.4/files/Install_Script.sh deleted file mode 100644 index e913894..0000000 --- a/stable/1.16.4/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16.3 -MC_VERSION=1.16.4 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16.5/Dockerfile b/stable/1.16.5/Dockerfile index 3c8d319..adbe694 100644 --- a/stable/1.16.5/Dockerfile +++ b/stable/1.16.5/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16.5" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16.5/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16.5/files/Install_Script.sh b/stable/1.16.5/files/Install_Script.sh deleted file mode 100644 index d492651..0000000 --- a/stable/1.16.5/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16.4 -MC_VERSION=1.16.5 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.16/Dockerfile b/stable/1.16/Dockerfile index acb06c0..3c74b8c 100644 --- a/stable/1.16/Dockerfile +++ b/stable/1.16/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.16" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/a0d03225615ba897619220e256a266cb33a44b6b/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.16/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.16/files/Install_Script.sh b/stable/1.16/files/Install_Script.sh deleted file mode 100644 index 62f6dbb..0000000 --- a/stable/1.16/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.15.2 -MC_VERSION=1.16 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a0d03225615ba897619220e256a266cb33a44b6b/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.17.1/Dockerfile b/stable/1.17.1/Dockerfile index 33b3836..4d5809a 100644 --- a/stable/1.17.1/Dockerfile +++ b/stable/1.17.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.17.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.17.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.17.1/files/Install_Script.sh b/stable/1.17.1/files/Install_Script.sh deleted file mode 100644 index 4127035..0000000 --- a/stable/1.17.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.17 -MC_VERSION=1.17.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.17/Dockerfile b/stable/1.17/Dockerfile index 72a2dd6..f91381a 100644 --- a/stable/1.17/Dockerfile +++ b/stable/1.17/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.17" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.17/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.17/files/Install_Script.sh b/stable/1.17/files/Install_Script.sh deleted file mode 100644 index 171b874..0000000 --- a/stable/1.17/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.16.5 -MC_VERSION=1.17 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.18.1/Dockerfile b/stable/1.18.1/Dockerfile index 28a5484..c96dc8b 100644 --- a/stable/1.18.1/Dockerfile +++ b/stable/1.18.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.18.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.18.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.18.1/files/Install_Script.sh b/stable/1.18.1/files/Install_Script.sh deleted file mode 100644 index f3a9991..0000000 --- a/stable/1.18.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18 -MC_VERSION=1.18.1 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.18.2/Dockerfile b/stable/1.18.2/Dockerfile index 6df4e74..6024ba7 100644 --- a/stable/1.18.2/Dockerfile +++ b/stable/1.18.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.18.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.18.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.18.2/files/Install_Script.sh b/stable/1.18.2/files/Install_Script.sh deleted file mode 100644 index 613b153..0000000 --- a/stable/1.18.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18.1 -MC_VERSION=1.18.2 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.18/Dockerfile b/stable/1.18/Dockerfile index 4f60620..3429e63 100644 --- a/stable/1.18/Dockerfile +++ b/stable/1.18/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.18" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.18/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.18/files/Install_Script.sh b/stable/1.18/files/Install_Script.sh deleted file mode 100644 index bda22d1..0000000 --- a/stable/1.18/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.17.1 -MC_VERSION=1.18 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.19.1/Dockerfile b/stable/1.19.1/Dockerfile index 48fbce5..ec7ad01 100644 --- a/stable/1.19.1/Dockerfile +++ b/stable/1.19.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.19.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.19.1/files/Install_Script.sh b/stable/1.19.1/files/Install_Script.sh deleted file mode 100644 index 3062592..0000000 --- a/stable/1.19.1/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19 -MC_VERSION=1.19.1 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8399e1211e95faa421c1507b322dbeae86d604df/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.19.2/Dockerfile b/stable/1.19.2/Dockerfile index 9c86a03..3331327 100644 --- a/stable/1.19.2/Dockerfile +++ b/stable/1.19.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.19.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.19.2/files/Install_Script.sh b/stable/1.19.2/files/Install_Script.sh deleted file mode 100644 index 9bd40c8..0000000 --- a/stable/1.19.2/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/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 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.19.3/Dockerfile b/stable/1.19.3/Dockerfile index b12b958..aed4013 100644 --- a/stable/1.19.3/Dockerfile +++ b/stable/1.19.3/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.3" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.19.3/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -26,7 +29,7 @@ RUN chmod +x /MCtemp/Install_Script.sh VOLUME /MCserver # 25565 Default. -EXPOSE ${GAME_PORT} +EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.19.3/files/Install_Script.sh b/stable/1.19.3/files/Install_Script.sh deleted file mode 100644 index 28d92c0..0000000 --- a/stable/1.19.3/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.2 -MC_VERSION=1.19.3 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.19.4/Dockerfile b/stable/1.19.4/Dockerfile index 6ad4065..1329f0a 100644 --- a/stable/1.19.4/Dockerfile +++ b/stable/1.19.4/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.19.4" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.19.4/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -26,7 +29,7 @@ RUN chmod +x /MCtemp/Install_Script.sh VOLUME /MCserver # 25565 Default. -EXPOSE ${GAME_PORT} +EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.19.4/files/Install_Script.sh b/stable/1.19.4/files/Install_Script.sh deleted file mode 100644 index 81be2d8..0000000 --- a/stable/1.19.4/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.3 -MC_VERSION=1.19.4 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.19/Dockerfile b/stable/1.19/Dockerfile index 53a7d1c..b260001 100644 --- a/stable/1.19/Dockerfile +++ b/stable/1.19/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.19" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.19/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -29,4 +32,4 @@ VOLUME /MCserver EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.19/files/Install_Script.sh b/stable/1.19/files/Install_Script.sh deleted file mode 100644 index ec6ff92..0000000 --- a/stable/1.19/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.18.2 -MC_VERSION=1.19 -MC_SERVER_FILE=https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.20.1/Dockerfile b/stable/1.20.1/Dockerfile index f36c822..41444ee 100644 --- a/stable/1.20.1/Dockerfile +++ b/stable/1.20.1/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.20.1" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.20.1/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -26,7 +29,7 @@ RUN chmod +x /MCtemp/Install_Script.sh VOLUME /MCserver # 25565 Default. -EXPOSE ${GAME_PORT} +EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.20.1/files/Install_Script.sh b/stable/1.20.1/files/Install_Script.sh deleted file mode 100644 index e4cdc41..0000000 --- a/stable/1.20.1/files/Install_Script.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.20 -MC_VERSION=1.20.1 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver -#exec screen ./MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.20.2/Dockerfile b/stable/1.20.2/Dockerfile index 5c61210..765f024 100644 --- a/stable/1.20.2/Dockerfile +++ b/stable/1.20.2/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.20.2" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.20.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -26,7 +29,7 @@ RUN chmod +x /MCtemp/Install_Script.sh VOLUME /MCserver # 25565 Default. -EXPOSE ${GAME_PORT} +EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.20.2/files/Install_Script.sh b/stable/1.20.2/files/Install_Script.sh deleted file mode 100644 index f7b3c18..0000000 --- a/stable/1.20.2/files/Install_Script.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.20.1 -MC_VERSION=1.20.2 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver -#exec screen ./MCserver/run-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit diff --git a/stable/1.20/Dockerfile b/stable/1.20/Dockerfile index 66abd26..51522cc 100644 --- a/stable/1.20/Dockerfile +++ b/stable/1.20/Dockerfile @@ -2,10 +2,13 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" ENV ACCEPT_EULA="false" -ENV GAME_PORT=25565 +ENV GAME_PORT="25565" +ENV MC_VERSION="1.20" +ENV MC_SERVER_FILE="https://launcher.mojang.com/v1/objects/15c777e2cfe0556eef19aab534b186c0c6f277e1/server.jar" +ENV MC_RUN_FILE="https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/stable/1.20/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/files/Install_Script_Vanilla.sh # Install java-17 & Dependencies. RUN apt-get -y update \ @@ -26,7 +29,7 @@ RUN chmod +x /MCtemp/Install_Script.sh VOLUME /MCserver # 25565 Default. -EXPOSE ${GAME_PORT} +EXPOSE 25565/udp 25565/tcp # Run command -CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ] +CMD [ "/bin/bash", "./MCtemp/Install_Script_Vanilla.sh" ] diff --git a/stable/1.20/files/Install_Script.sh b/stable/1.20/files/Install_Script.sh deleted file mode 100644 index dcc4e70..0000000 --- a/stable/1.20/files/Install_Script.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 fithwum -# All rights reserved - -# Variables. -echo " " -echo "INFO ! Checking for latest Minecraft Server version." -MC_VERSION_OLD=1.19.4 -MC_VERSION=1.20 -MC_SERVER_FILE=https://piston-data.mojang.com/v1/objects/15c777e2cfe0556eef19aab534b186c0c6f277e1/server.jar -MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/files/run-vanilla.sh - -# 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-vanilla_${MC_VERSION_OLD}.sh /MCserver/old-server-versions/${MC_VERSION_OLD} - wget --no-cache ${MC_SERVER_FILE} -O /MCserver/MCserver_${MC_VERSION}.jar -fi - -sleep 1 - -# Looking for run-vanilla_${MC_VERSION}.sh -if [ -e /MCserver/run-vanilla_${MC_VERSION}.sh ] - then - echo " " - echo "INFO ! run-vanilla_${MC_VERSION}.sh found ... will use existing file." - else - echo " " - echo "WARNING ! run-vanilla_${MC_VERSION_OLD}.sh is out of date/missing ... will download now." - wget --no-cache ${MC_RUN_FILE} -O /MCserver/run-vanilla_${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-vanilla_${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-vanilla_${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-vanilla_${MC_VERSION}.sh --dataPath=/MCserver - -exit