From 32cb03a5b352386ed0e044daa26e9777339d3c86 Mon Sep 17 00:00:00 2001
From: Shawn Anderson <sanderson@eye-catcher.com>
Date: Wed, 21 Apr 2021 20:05:03 -0400
Subject: [PATCH] Updated Dockerfile and related files

---
 Dockerfile         | 55 ++++++++++++++++++++++++++++++++--------------
 docker-compose.yml |  4 ++--
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b51d628..4ddb806 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,9 @@
 # Stage 1 - Build the frontend
-FROM amd64/node:15.5-buster AS node-build-env
+FROM node:15.5-buster AS node-build-env
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+ARG BUILDPLATFORM
+ENV BUILDPLATFORM=${BUILDPLATFORM:-linux/amd64}
 
 RUN mkdir /appclient
 WORKDIR /appclient
@@ -11,24 +15,38 @@ RUN \
    npx ng build --prod --output-path=out
 
 # Stage 2 - Build the backend
-FROM mcr.microsoft.com/dotnet/sdk:5.0.103-alpine3.13-amd64 AS dotnet-build-env
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim-amd64 AS dotnet-build-env
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+ARG BUILDPLATFORM
+ENV BUILDPLATFORM=${BUILDPLATFORM:-linux/amd64}
 
 RUN mkdir /appserver
 WORKDIR /appserver
 
 RUN \
+   echo "**** Cloning Source Code ****" && \ 
    git clone https://github.com/rogerfar/rdt-client.git . && \
+   echo "**** Building Source Code for $TARGETPLATFORM on $BUILDPLATFORM ****" && \ 
    cd server && \
-   if [ "$BUILDPLATFORM" = "arm/v7" ] ; then dotnet restore -r linux-arm RdtClient.sln ; else dotnet restore RdtClient.sln ; fi && \
-   if [ "$BUILDPLATFORM" = "arm/v7" ] ; then dotnet publish -r linux-arm -c Release -o out ; else dotnet publish -c Release -o out ; fi
+   if [ "$TARGETPLATFORM" = "linux/arm/v7" -o "$TARGETPLATFORM" = "linux/arm64" ] ; then \
+      echo "**** Building $TARGETPLATFORM version" && \
+      dotnet restore -r linux-arm RdtClient.sln && dotnet publish -r linux-arm -c Release -o out ; \
+   else \
+      echo "**** Building standard version" && \
+      dotnet restore RdtClient.sln && dotnet publish -c Release -o out ; \
+   fi
 
 # Stage 3 - Build runtime image
-FROM ghcr.io/linuxserver/baseimage-mono:LTS
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+ARG BUILDPLATFORM
+ENV BUILDPLATFORM=${BUILDPLATFORM:-linux/amd64}
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG RDTCLIENT_VERSION
 LABEL build_version="Linuxserver.io extended version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="ravensorb"
 
@@ -37,16 +55,18 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV XDG_CONFIG_HOME="/config/xdg"
 ENV RDTCLIENT_BRANCH="main"
 
-RUN mkdir /app || true && mkdir -p /data/downloads /data/db || true && \
+RUN \
+    mkdir -p /data/downloads /data/db || true && \
     echo "**** Updating package information ****" && \ 
-    apt update -y -qq && \
-    apt install -y -qq wget && \
+    apt-get update -y -qq && \
+    echo "**** Install pre-reqs ****" && \ 
+    apt-get install -y -qq wget && \
+    apt-get install -y libc6 libgcc1 libgssapi-krb5-2 libssl1.1 libstdc++6 zlib1g libicu66 && \
     echo "**** Installing dotnet ****" && \
-    wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb  && \
-    dpkg -i packages-microsoft-prod.deb 2> /dev/null && \
-    rm packages-microsoft-prod.deb && \
-    apt update -y -qq && \
-    apt install -y -qq apt-transport-https dotnet-runtime-5.0 aspnetcore-runtime-5.0 && \
+    wget -q https://dot.net/v1/dotnet-install.sh && \
+    chmod +x ./dotnet-install.sh && \
+    bash ./dotnet-install.sh -c Current --runtime dotnet --install-dir /usr/share/dotnet && \
+    bash ./dotnet-install.sh -c Current --runtime aspnetcore --install-dir /usr/share/dotnet && \
     echo "**** Cleaning image ****" && \
     apt-get -y -qq -o Dpkg::Use-Pty=0 clean && apt-get -y -qq -o Dpkg::Use-Pty=0 purge && \
     echo "**** Setting permissions ****" && \
@@ -56,12 +76,15 @@ RUN mkdir /app || true && mkdir -p /data/downloads /data/db || true && \
         /var/lib/apt/lists/* \
         /var/tmp/* || true
 
+ENV PATH "$PATH:/usr/share/dotnet"
+
 WORKDIR /app
 COPY --from=dotnet-build-env /appserver/server/out .
 COPY --from=node-build-env /appclient/client/out ./wwwroot
 
+# add local files
+COPY root/ /
+
 # ports and volumes
 EXPOSE 6500
 VOLUME ["/config", "/data" ]
-
-ENTRYPOINT ["dotnet", "RdtClient.Web.dll"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6dc10f9..29e641d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ services:
     rdtclient:
         image: rogerfar/rdtclient
         volumes:
-            - 'C:/Downloads/:/data/downloads'
-            - 'C:/Docker/rdtclient/:/data/db'
+            - ./data/downloads:/data/downloads
+            - ./data/db:/data/db
         container_name: rdtclient
         restart: always
         logging: