From bedebb972ed9cb136ac83d3860e4af2c82db5677 Mon Sep 17 00:00:00 2001 From: Quinten Date: Thu, 4 Apr 2024 09:29:00 +0200 Subject: [PATCH] keep alt:v like it is, dotnet 5 is EOL --- games/altv/Dockerfile | 13 ++++--------- games/altv/entrypoint.sh | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile index d035f767e..ae54973f4 100644 --- a/games/altv/Dockerfile +++ b/games/altv/Dockerfile @@ -15,15 +15,10 @@ RUN apt update -y \ libfontconfig1 libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata libgdiplus\ python3 dnsutils build-essential coreutils jq pcregrep tini -RUN wget https://dot.net/v1/dotnet-install.sh \ - && D_V_5="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/5.0 | grep -i '

SDK 5.*.*

' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \ - && D_V_6="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/6.0 | grep -i '

SDK 6.*.*

' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \ - && D_V_7="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/7.0 | grep -i '

SDK 7.*.*

' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \ - && chmod +x dotnet-install.sh \ - && ./dotnet-install.sh -i /usr/share -v $D_V_5 \ - && ./dotnet-install.sh -i /usr/share -v $D_V_6 \ - && ./dotnet-install.sh -i /usr/share -v $D_V_7 \ - && ln -s /usr/share/dotnet /usr/bin/dotnet +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 update -y \ + && apt install -y dotnet-sdk-6.0 dotnet-sdk-7.0 libgdiplus RUN update-locale lang=en_US.UTF-8 \ && dpkg-reconfigure --frontend noninteractive locales diff --git a/games/altv/entrypoint.sh b/games/altv/entrypoint.sh index 6e7a50a98..11acd7006 100644 --- a/games/altv/entrypoint.sh +++ b/games/altv/entrypoint.sh @@ -5,8 +5,6 @@ cd /home/container INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP -export DOTNET_ROOT=/usr/share/ - # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') echo -e ":/home/container$ ${MODIFIED_STARTUP}"