diff --git a/testing/Dockerfile b/testing/Dockerfile index 0363e4e..88fa664 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -14,8 +14,11 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/te # Install java-17 & Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ - && apt-get -y --fix-broken install \ - && apt-get install -y --no-install-recommends openjdk-17-jdk screen bzip2 jq \ + && apt-get install wget lsb-release -y \ + && wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && sudo dpkg -i packages-microsoft-prod.deb \ + && apt-get -y update && apt-get -y --fix-broken install \ + && apt-get install -y --no-install-recommends msopenjdk-21 screen bzip2 jq \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates -f; diff --git a/testing/install_script.sh b/testing/install_script.sh index 9b1ead8..b1a0f39 100644 --- a/testing/install_script.sh +++ b/testing/install_script.sh @@ -5,6 +5,12 @@ # Display setup #export DISPLAY=0 +https://download.oracle.com/java/22/latest/jdk-22_linux-x64_bin.deb +JAVA_DOWNLOAD=https://download.java.net/java/GA/jdk22.0.1/c7ec1332f7bb44aeba2eb341ae18aca4/8/GPL/openjdk-22.0.1_linux-x64_bin.tar.gz +curl -s $JAVA_DOWNLOAD +tar xvf openjdk-13*_bin.tar.gz + + 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