From 853c9caf5c3964ff8bc4a7206c96e49bc5e6ad31 Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 1 Jul 2025 08:45:44 -0700 Subject: [PATCH] updates --- bedrock/Dockerfile | 2 +- bedrock/install_script.sh | 4 ++-- build_minecraft.sh | 11 +++++------ fabric/Dockerfile | 2 +- fabric/install_script.sh | 2 +- forge/Dockerfile | 2 +- forge/Install_Script.sh | 6 +++--- testing/Dockerfile | 2 +- testing/install_script.sh | 2 +- vanilla/Dockerfile | 2 +- vanilla/install_script.sh | 2 +- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile index 911a92a..b44d10c 100644 --- a/bedrock/Dockerfile +++ b/bedrock/Dockerfile @@ -10,7 +10,7 @@ ENV XMS_SIZE="" ENV XMN_SIZE="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/bedrock/install_script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/bedrock/install_script.sh # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ diff --git a/bedrock/install_script.sh b/bedrock/install_script.sh index 76644a2..5f7181e 100644 --- a/bedrock/install_script.sh +++ b/bedrock/install_script.sh @@ -7,7 +7,7 @@ VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') -MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/vanilla/run.sh rm -fr /MCserver/MCserver_*.jar rm -fr /MCserver/run_*.sh @@ -30,7 +30,7 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ] fi sleep 1 - +https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/ # Looking for run-${MC_VERSION}.sh if [ -e /MCserver/run-$MC_VERSION.sh ] then diff --git a/build_minecraft.sh b/build_minecraft.sh index d48d566..8f72f08 100755 --- a/build_minecraft.sh +++ b/build_minecraft.sh @@ -2,9 +2,8 @@ # Copyright (c) 2023 fithwum # All rights reserved -docker build --pull --rm -f "testing/Dockerfile" -t fithwum/minecraft:testing "vanilla" -docker build --pull --rm -f "vanilla/Dockerfile" -t fithwum/minecraft:latest "vanilla" -docker build --pull --rm -f "fabric/Dockerfile" -t fithwum/minecraft-fabric:latest "fabric" -docker push fithwum/minecraft:testing -docker push fithwum/minecraft:latest -docker push fithwum/minecraft-fabric:latest +docker build --pull --rm -f "testing/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:testing "vanilla" +docker build --pull --rm -f "vanilla/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:latest "vanilla" +docker build --pull --rm -f "fabric/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft-fabric:latest "fabric" +docker push -a gitea.fithwum.tech/fithwum/minecraft +docker push -a gitea.fithwum.tech/fithwum/minecraft-fabric diff --git a/fabric/Dockerfile b/fabric/Dockerfile index bf47729..3e733e9 100644 --- a/fabric/Dockerfile +++ b/fabric/Dockerfile @@ -12,7 +12,7 @@ ENV XMS_SIZE="" ENV XMN_SIZE="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/install_script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/fabric/install_script.sh # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ diff --git a/fabric/install_script.sh b/fabric/install_script.sh index fcc3704..8267c2b 100644 --- a/fabric/install_script.sh +++ b/fabric/install_script.sh @@ -4,7 +4,7 @@ # Main Install Links SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar -MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fabric/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/fabric/run.sh rm -fr /MCserver/run_*.sh diff --git a/forge/Dockerfile b/forge/Dockerfile index b326d32..5fc469c 100644 --- a/forge/Dockerfile +++ b/forge/Dockerfile @@ -6,7 +6,7 @@ ENV GAME_PORT=25565 ENV FORGE_URL=https://maven.minecraftforge.net/net/minecraftforge/forge/1.19.2-43.2.0/forge-1.19.2-43.2.0-installer.jar # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-1.19.2/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/forge/forge-1.19.2/files/Install_Script.sh # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ diff --git a/forge/Install_Script.sh b/forge/Install_Script.sh index f80513d..e6ec577 100644 --- a/forge/Install_Script.sh +++ b/forge/Install_Script.sh @@ -7,9 +7,9 @@ echo " " echo "INFO ! Checking for latest Minecraft Server version." MC_VERSION=1.19.2 -EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/eula.txt -OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/ops.json -WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/master/forge/forge-${MC_VERSION}/files/whitelist.json +EULA_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/forge/forge-${MC_VERSION}/files/eula.txt +OPS_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/forge/forge-${MC_VERSION}/files/ops.json +WHITELIST_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/forge/forge-${MC_VERSION}/files/whitelist.json # Main install (Debian). # Check for files in /MCserver and download if needed. diff --git a/testing/Dockerfile b/testing/Dockerfile index 819d939..68c2bab 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -10,7 +10,7 @@ ENV XMS_SIZE="" ENV XMN_SIZE="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/testing/install_script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/testing/install_script.sh # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ diff --git a/testing/install_script.sh b/testing/install_script.sh index 962022d..8005415 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -7,7 +7,7 @@ VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') -MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/testing/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/testing/run.sh rm -fr /MCserver/MCserver_*.jar rm -fr /MCserver/run_*.sh diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index d29b108..c2f3ce4 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -10,7 +10,7 @@ ENV XMS_SIZE="" ENV XMN_SIZE="" # URL's for files -ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/install_script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/vanilla/install_script.sh # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh index 9905ddc..d0ddcfc 100644 --- a/vanilla/install_script.sh +++ b/vanilla/install_script.sh @@ -4,7 +4,7 @@ VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json') MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url') -MC_RUN_FILE=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/vanilla/run.sh +MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/vanilla/run.sh rm -fr /MCserver/MCserver_*.jar rm -fr /MCserver/run_*.sh