From fda4727439d7c553412279d768d4734d27ff67b1 Mon Sep 17 00:00:00 2001
From: Roger Far <roger@versluis.ca>
Date: Thu, 11 Feb 2021 21:01:48 -0700
Subject: [PATCH] Add user and group dotnet with ID 1000 to the Dockerfile.

---
 Dockerfile           | 14 ++++++++++++--
 docker-build-dev.bat |  5 +++++
 docker-build.bat     |  4 ----
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 docker-build-dev.bat
 delete mode 100644 docker-build.bat

diff --git a/Dockerfile b/Dockerfile
index 9efe7ff..6728ddd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN npm ci
 RUN npx ng build --prod --output-path=out
 
 # Stage 2 - Build the backend
-FROM mcr.microsoft.com/dotnet/sdk:5.0.102-1-buster-slim-amd64 AS dotnet-build-env
+FROM mcr.microsoft.com/dotnet/sdk:5.0.103-alpine3.13-amd64 AS dotnet-build-env
 
 RUN mkdir /appserver
 WORKDIR /appserver
@@ -20,9 +20,19 @@ RUN if [ "$BUILDPLATFORM" = "arm/v7" ] ; then dotnet restore -r linux-arm RdtCli
 RUN if [ "$BUILDPLATFORM" = "arm/v7" ] ; then dotnet publish -r linux-arm -c Release -o out ; else dotnet publish -c Release -o out ; fi
 
 # Stage 3 - Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0.2-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0.3-buster-slim AS base
+
+RUN addgroup --quiet --gid 1000 dotnet
+RUN adduser --system --uid 1000 --group dotnet --shell /bin/sh
+
 RUN mkdir /app
+
 WORKDIR /app
 COPY --from=dotnet-build-env /appserver/out .
 COPY --from=node-build-env /appclient/out ./wwwroot
+
+RUN chown -R dotnet:dotnet /app
+
+USER 1000
+
 ENTRYPOINT ["dotnet", "RdtClient.Web.dll"]
\ No newline at end of file
diff --git a/docker-build-dev.bat b/docker-build-dev.bat
new file mode 100644
index 0000000..54a27d4
--- /dev/null
+++ b/docker-build-dev.bat
@@ -0,0 +1,5 @@
+docker stop rdtclientdev
+docker rm rdtclientdev
+docker build --tag rdtclientdev .
+docker run --cap-add=NET_ADMIN -d -v C:/Temp/RdtClient/:/data/downloads -v C:/Temp/RdtClient/:/data/db --log-driver json-file --log-opt max-size=10m -p 6500:6500 --name rdtclientdev rdtclientdev
+docker exec -it rdtclientdev /bin/bash
\ No newline at end of file
diff --git a/docker-build.bat b/docker-build.bat
deleted file mode 100644
index b308e75..0000000
--- a/docker-build.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-docker stop rdtclient
-docker rm rdtclient
-docker build --tag rdtclient .
-docker-compose up -d
\ No newline at end of file