From 0d161256ea14dcfc7e99665c969d5c3bf0eed388 Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 18 Jun 2024 17:22:21 -0700 Subject: [PATCH] java updates --- fabric/Dockerfile | 9 ++++++--- vanilla/Dockerfile | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/fabric/Dockerfile b/fabric/Dockerfile index db31592..bf47729 100644 --- a/fabric/Dockerfile +++ b/fabric/Dockerfile @@ -16,8 +16,11 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/fa # 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 \ + && 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; @@ -32,4 +35,4 @@ RUN chmod +x /MCtemp/install_script.sh VOLUME /MCserver # Run command -CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] \ No newline at end of file +CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index 2b2ce88..d29b108 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -14,8 +14,11 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/va # 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 \ + && 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;