From 66df042cc04593cc2565541d01d2c6d9048ad1ba Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 3 Jul 2025 06:27:11 -0700 Subject: [PATCH] test --- fabric/Dockerfile | 6 +----- vanilla/Dockerfile | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/fabric/Dockerfile b/fabric/Dockerfile index 36a530b..2c0b5ae 100644 --- a/fabric/Dockerfile +++ b/fabric/Dockerfile @@ -35,8 +35,4 @@ RUN chmod +x /MCtemp/install_script.sh VOLUME /MCserver # Run command -CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] - - - -#jkldfhgkldsfg \ No newline at end of file +CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] \ No newline at end of file diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile index 45020fd..0b1883e 100644 --- a/vanilla/Dockerfile +++ b/vanilla/Dockerfile @@ -12,28 +12,31 @@ ENV XMN_SIZE="" # URL's for files 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 -y autoclean && apt-get -y autoremove \ - && apt-get install -y wget -RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb -RUN apt-get -y update && apt-get -y --fix-broken install \ - && apt-get install -y --no-install-recommends msopenjdk-21 screen bzip2 jq \ +# Install Dependencies. +RUN apt-get -y update \ + && apt-get install -y --no-install-recommends wget screen bzip2 jq \ + && apt-get -y autoclean \ + && apt-get -y autoremove \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates -f; +# 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 --no-install-recommends msopenjdk-21 \ + && apt-get -y update && apt-get -y --fix-broken install + # Folder creation. RUN mkdir -p /MCserver /MCtemp \ && chmod 777 -R /MCserver /MCtemp \ && chown 99:100 -R /MCserver /MCtemp -ADD "$INSTALL_SCRIPT" /MCtemp -RUN chmod +x /MCtemp/install_script.sh + +# Main script +RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \ + && chmod +x /MCtemp/install_script.sh # Directory where data is stored VOLUME /MCserver # Run command -CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] - - -#asldkhjfg;kljagsfcc \ No newline at end of file +CMD [ "/bin/bash", "./MCtemp/install_script.sh" ] \ No newline at end of file