diff --git a/fabric/Dockerfile b/fabric/Dockerfile index 612c2a4..0cc18ac 100644 --- a/fabric/Dockerfile +++ b/fabric/Dockerfile @@ -32,6 +32,12 @@ RUN wget "$JAVA" -O /tmp/msopenjdk-21.tar.gz \ && update-alternatives --install /usr/bin/java java /usr/lib/jvm/msopenjdk-21/bin/java 1 \ && update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/msopenjdk-21/bin/javac 1 +# Install java +# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +# && dpkg -i packages-microsoft-prod.deb \ +# && apt-get install -y msopenjdk-21 \ +# && apt-get -y update && apt-get -y --fix-broken install + # Folder creation. RUN mkdir -p /MCserver /MCtemp \ && chmod 777 -R /MCserver /MCtemp \ diff --git a/testing/Dockerfile b/testing/Dockerfile index 9498fd3..7f3e9cd 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -10,21 +10,31 @@ ENV XMS_SIZE="" ENV XMN_SIZE="" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/testing/install_script.sh +ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/fabric/install_script.sh +ARG JAVA=https://github.com/microsoft/openjdk/releases/download/jdk-21+35/msopenjdk-21+35-x64.tar.gz # Install Dependencies. RUN apt-get -y update \ && apt-get install -y --no-install-recommends wget lsb-release screen bzip2 jq \ + && apt-get -y --fix-broken install \ && apt-get -y autoclean \ && apt-get -y autoremove \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates -f; +# Install Microsoft OpenJDK 21 (manually download from GitHub) +RUN wget "$JAVA" -O /tmp/msopenjdk-21.tar.gz \ + && mkdir -p /usr/lib/jvm \ + && tar -xvzf /tmp/msopenjdk-21.tar.gz -C /usr/lib/jvm \ + && rm /tmp/msopenjdk-21.tar.gz \ + && update-alternatives --install /usr/bin/java java /usr/lib/jvm/msopenjdk-21/bin/java 1 \ + && update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/msopenjdk-21/bin/javac 1 + # Install java -RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb \ - && apt-get install -y msopenjdk-21 \ - && apt-get -y update && apt-get -y --fix-broken install +# RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +# && dpkg -i packages-microsoft-prod.deb \ +# && apt-get install -y msopenjdk-21 \ +# && apt-get -y update && apt-get -y --fix-broken install # Folder creation. RUN mkdir -p /MCserver /MCtemp \ diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index 9c382a7..7f3e9cd 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -49,6 +49,4 @@ RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \ VOLUME /MCserver # Run command -CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] - -#ldkgfmh;fmgh; \ No newline at end of file +CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] \ No newline at end of file