diff --git a/server/Dockerfile b/server/Dockerfile index adc74c6..120b942 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -11,10 +11,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/m # Install Dependencies. RUN apt-get -y update && apt-get autoclean && apt-get autoremove \ - && wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ - && dpkg -i packages-microsoft-prod.deb \ - && rm packages-microsoft-prod.deb \ - && apt-get -y update && apt-get install dotnet-sdk-8.0 bzip2 jq wget procps pcregrep screen -y \ + && apt-get -y update && apt-get install -y bzip2 jq wget procps pcregrep screen \ && adduser vintagestory \ && apt-get -y --fix-broken install \ && rm -rf /var/lib/apt/lists/* \ diff --git a/server/install_script.sh b/server/install_script.sh index 5ead785..c7609c6 100644 --- a/server/install_script.sh +++ b/server/install_script.sh @@ -4,6 +4,13 @@ VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$VS_VERSION.tar.gz +# DOTnet install +wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +dpkg -i packages-microsoft-prod.deb +rm packages-microsoft-prod.deb +apt-get -y update +apt-get install -y dotnet-sdk-8.0 + # Main install (Debian). # Check for server files and download if needed. if [ -e /vs_server/server/server-$VS_VERSION.sh ] @@ -28,11 +35,11 @@ fi sleep 1 echo "INFO ! Setting server path." -sed '/VSPATH='/home/vintagestory/server'/c\VSPATH='/vs_server/server'' /vs_server/server/server-$VS_VERSION.sh +sed -i '/VSPATH='*'/c\VSPATH='/vs_server/server'' /vs_server/server/server-$VS_VERSION.sh echo "INFO ! Setting data path." -sed '/DATAPATH='/var/vintagestory/data'/c\DATAPATH='/vs_server/data'' /vs_server/server/server-$VS_VERSION.sh +sed -i '/DATAPATH='*'/c\DATAPATH='/vs_server/data'' /vs_server/server/server-$VS_VERSION.sh echo "INFO ! Setting username." -sed '/USERNAME='vintagestory'/c\USERNAME='$USERNAME'' /vs_server/server/server-$VS_VERSION.sh +sed -i '/USERNAME='*'/c\USERNAME='$USERNAME'' /vs_server/server/server-$VS_VERSION.sh sleep 1