From c349cd2613159be0f61be00bc242b7a27c3d700f Mon Sep 17 00:00:00 2001 From: Roger Versluis Date: Tue, 21 Nov 2023 17:01:19 -0700 Subject: [PATCH] no message --- CHANGELOG.md | 4 ++++ Dockerfile | 16 +++++++++++++++- client/src/app/navbar/navbar.component.html | 2 +- package.json | 2 +- server/RdtClient.Web/RdtClient.Web.csproj | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4da960..b38ff07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.48] - 2023-11-15 +### Changed +- Reverted dockerfile again as the packagemanager still doesn't have .net 8. + ## [2.0.47] - 2023-11-15 ### Changed - Changed docker to use the package manager again. diff --git a/Dockerfile b/Dockerfile index 97914fd..d855025 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,21 @@ RUN \ echo "**** Install pre-reqs ****" && \ apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib && \ echo "**** Installing dotnet ****" && \ - apk add aspnetcore8-runtime && \ + mkdir -p /usr/share/dotnet + +RUN \ + if [ "$TARGETPLATFORM" = "linux/arm/v7" ] ; then \ + wget https://download.visualstudio.microsoft.com/download/pr/c3bf3103-efdb-42e0-af55-bbf861a4215b/dc22eda8877933b8c6569e3823f18d21/aspnetcore-runtime-8.0.0-linux-musl-arm64.tar.gz && \ + tar zxf aspnetcore-runtime-8.0.0-linux-musl-arm64.tar.gz -C /usr/share/dotnet ; \ + elif [ "$TARGETPLATFORM" = "linux/arm/v8" ] ; then \ + wget https://download.visualstudio.microsoft.com/download/pr/c3bf3103-efdb-42e0-af55-bbf861a4215b/dc22eda8877933b8c6569e3823f18d21/aspnetcore-runtime-8.0.0-linux-musl-arm64.tar.gz && \ + tar zxf aspnetcore-runtime-8.0.0-linux-musl-arm64.tar.gz -C /usr/share/dotnet ; \ + else \ + wget https://download.visualstudio.microsoft.com/download/pr/7aa33fc7-07fe-48c2-8e44-a4bfb4928535/3b96ec50970eee414895ef3a5b188bcd/aspnetcore-runtime-8.0.0-linux-musl-x64.tar.gz && \ + tar zxf aspnetcore-runtime-8.0.0-linux-musl-x64.tar.gz -C /usr/share/dotnet ; \ + fi + +RUN \ echo "**** Setting permissions ****" && \ chown -R abc:abc /data && \ rm -rf \ diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html index 9e5e1f7..1621838 100644 --- a/client/src/app/navbar/navbar.component.html +++ b/client/src/app/navbar/navbar.component.html @@ -55,7 +55,7 @@ Profile Logout - Version 2.0.47 + Version 2.0.48 diff --git a/package.json b/package.json index 27b7c48..57425c8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rdt-client", - "version": "2.0.47", + "version": "2.0.48", "description": "This is a web interface to manage your torrents on Real-Debrid.", "main": "index.js", "dependencies": { diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj index cf11664..f6f7413 100644 --- a/server/RdtClient.Web/RdtClient.Web.csproj +++ b/server/RdtClient.Web/RdtClient.Web.csproj @@ -4,7 +4,7 @@ net8.0 Exe 94c24cba-f03f-4453-a671-3640b517c573 - 2.0.47 + 2.0.48 enable enable latest