From 179c528079ad237e545c44157dadab6d87366bd6 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 3 Jul 2025 07:03:30 -0700 Subject: [PATCH] update --- fabric/Dockerfile | 24 ++++++++++++------------ testing/Dockerfile | 24 ++++++++++++------------ vanilla/Dockerfile | 20 ++++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/fabric/Dockerfile b/fabric/Dockerfile index 0cc18ac..b583952 100644 --- a/fabric/Dockerfile +++ b/fabric/Dockerfile @@ -13,7 +13,7 @@ ENV XMN_SIZE="" # URL's for files 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 +ARG JAVA=https://aka.ms/download-jdk/microsoft-jdk-21.0.7-linux-x64.tar.gz # Install Dependencies. RUN apt-get -y update \ @@ -24,19 +24,19 @@ RUN apt-get -y update \ && 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 Microsoft OpenJDK 21 (manuall download) +# 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/$(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 +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 update && 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/testing/Dockerfile b/testing/Dockerfile index 7f3e9cd..32a7fa3 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -11,7 +11,7 @@ ENV XMN_SIZE="" # URL's for files 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 +ARG JAVA=https://aka.ms/download-jdk/microsoft-jdk-21.0.7-linux-x64.tar.gz # Install Dependencies. RUN apt-get -y update \ @@ -22,19 +22,19 @@ RUN apt-get -y update \ && 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 Microsoft OpenJDK 21 (manuall download) +# 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 update && 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 e17100f..32a7fa3 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -23,18 +23,18 @@ RUN apt-get -y update \ && update-ca-certificates -f; # Install Microsoft OpenJDK 21 (manuall download) -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 +# 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 update && apt-get install -y msopenjdk-21 \ + && apt-get -y update && apt-get -y --fix-broken install # Folder creation. RUN mkdir -p /MCserver /MCtemp \