Merge pull request #382 from realaashil/master

docker: fix docker images for arm64
rogerfar · Jan 5, 2024 · d1042f6 · d1042f6
2 parents dc0541e + 5b82a21
commit d1042f6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git 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.50] - 2023-11-25
+### Changed
+- Fixed Docker Builds for arm64
+
 ## [2.0.49] - 2023-11-24
 ### Changed
 - Fixed memory issue in internal downloader
@@ -517,4 +521,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.3.0]: https://github.com/rogerfar/rdt-client/releases/tag/1.3
 [1.2.0]: https://github.com/rogerfar/rdt-client/releases/tag/1.2
 [1.1.0]: https://github.com/rogerfar/rdt-client/releases/tag/1.1
-[1.0.0]: https://github.com/rogerfar/rdt-client/releases/tag/v1.0
+[1.0.0]: https://github.com/rogerfar/rdt-client/releases/tag/v1.0
diff --git a/Dockerfile b/Dockerfile
@@ -35,16 +35,7 @@ RUN \
    git clone https://github.com/rogerfar/rdt-client.git . && \
    echo "**** Building Source Code for $TARGETPLATFORM on $BUILDPLATFORM ****" && \
    cd server && \
-   if [ "$TARGETPLATFORM" = "linux/arm/v7" ] ; then \
-      echo "**** Building $TARGETPLATFORM arm v7 version" && \
-      dotnet restore --no-cache -r linux-arm RdtClient.sln && dotnet publish --no-restore -r linux-arm -c Release -o out ; \
-   elif [ "$TARGETPLATFORM" = "linux/arm/v8" ] ; then \
-      echo "**** Building $TARGETPLATFORM arm v8 version" && \
-      dotnet restore --no-cache -r linux-arm64 RdtClient.sln && dotnet publish --no-restore -r linux-arm64 -c Release -o out ; \
-   else \
-      echo "**** Building $TARGETPLATFORM x64 version" && \
-      dotnet restore --no-cache RdtClient.sln && dotnet publish --no-restore -c Release -o out ; \
-   fi
+   dotnet restore --no-cache RdtClient.sln && dotnet publish --no-restore -c Release -o out ; 
 
 # Stage 3 - Build runtime image
 FROM ghcr.io/linuxserver/baseimage-alpine:3.18
@@ -65,33 +56,33 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV RDTCLIENT_BRANCH="main"
 
 RUN \
-    mkdir -p /data/downloads /data/db || true && \
-    echo "**** Updating package information ****" && \
-    apk update && \
-    echo "**** Install pre-reqs ****" && \
-    apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib && \
-    echo "**** Installing dotnet ****" && \
-	mkdir -p /usr/share/dotnet
+   mkdir -p /data/downloads /data/db || true && \
+   echo "**** Updating package information ****" && \
+   apk update && \
+   echo "**** Install pre-reqs ****" && \
+   apk add bash icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib && \
+   echo "**** Installing dotnet ****" && \
+   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 ; \
+   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/arm64" ] ; 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 ; \
+   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 \
-        /tmp/* \
-        /var/cache/apk/* \
-        /var/tmp/* || true
+   echo "**** Setting permissions ****" && \
+   chown -R abc:abc /data && \
+   rm -rf \
+   /tmp/* \
+   /var/cache/apk/* \
+   /var/tmp/* || true
 
 ENV PATH "$PATH:/usr/share/dotnet"
 
@@ -106,4 +97,4 @@ EXPOSE 6500
 VOLUME [ "/data" ]
 
 # Check Status
-HEALTHCHECK --interval=30s --timeout=30s --start-period=30s --retries=3 CMD curl --fail http://localhost:6500 || exit 
+HEALTHCHECK --interval=30s --timeout=30s --start-period=30s --retries=3 CMD curl --fail http://localhost:6500 || exit 
diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html
@@ -55,7 +55,7 @@
           <a class="navbar-item" routerLink="profile"> Profile </a>
           <a class="navbar-item" (click)="logout()"> Logout </a>
           <hr class="navbar-divider" />
-          <a href="https://github.com/rogerfar/rdt-client" target="_blank" class="navbar-item">Version 2.0.49</a>
+          <a href="https://github.com/rogerfar/rdt-client" target="_blank" class="navbar-item">Version 2.0.50</a>
         </div>
       </div>
     </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rdt-client",
-  "version": "2.0.49",
+  "version": "2.0.50",
   "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
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <UserSecretsId>94c24cba-f03f-4453-a671-3640b517c573</UserSecretsId>
-    <Version>2.0.49</Version>
+    <Version>2.0.50</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>