From c916247655e0a510f5fb35fe90dad658925bf2a0 Mon Sep 17 00:00:00 2001
From: xingsy97 <87063252+xingsy97@users.noreply.github.com>
Date: Thu, 16 Jun 2022 13:35:49 +0800
Subject: [PATCH] update Dockerfile

---
 samples/AdvancedChatRoom/Dockerfile | 19 +++++++++++++++----
 samples/ChatRoom/Dockerfile         | 19 +++++++++++++++----
 samples/ChatRoomLocal/Dockerfile    | 19 +++++++++++++++----
 samples/GitHubChat/Dockerfile       | 18 ++++++++++++++----
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/samples/AdvancedChatRoom/Dockerfile b/samples/AdvancedChatRoom/Dockerfile
index 0f591390..e964abab 100644
--- a/samples/AdvancedChatRoom/Dockerfile
+++ b/samples/AdvancedChatRoom/Dockerfile
@@ -1,6 +1,17 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src/AdvancedChatRoom
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
 
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src/
 COPY ./. ./
-RUN dotnet restore && dotnet build
-ENTRYPOINT ["bash", "-c", "dotnet run --urls http://0.0.0.0:80"]
\ No newline at end of file
+RUN dotnet restore "AdvancedChatRoom.csproj"
+RUN dotnet build "AdvancedChatRoom.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "AdvancedChatRoom.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "AdvancedChatRoom.dll", "--urls", "http://0.0.0.0:80"]
\ No newline at end of file
diff --git a/samples/ChatRoom/Dockerfile b/samples/ChatRoom/Dockerfile
index 7696c89f..8f01e34b 100644
--- a/samples/ChatRoom/Dockerfile
+++ b/samples/ChatRoom/Dockerfile
@@ -1,6 +1,17 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src/ChatRoom
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
 
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src/
 COPY ./. ./
-RUN dotnet restore && dotnet build
-ENTRYPOINT ["bash", "-c", "dotnet run --urls http://0.0.0.0:80"]
\ No newline at end of file
+RUN dotnet restore "ChatRoom.csproj"
+RUN dotnet build "ChatRoom.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "ChatRoom.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "ChatRoom.dll", "--urls", "http://0.0.0.0:80"]
\ No newline at end of file
diff --git a/samples/ChatRoomLocal/Dockerfile b/samples/ChatRoomLocal/Dockerfile
index c7649299..4b9489b6 100644
--- a/samples/ChatRoomLocal/Dockerfile
+++ b/samples/ChatRoomLocal/Dockerfile
@@ -1,6 +1,17 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src/ChatRoomLocal
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
 
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src/
 COPY ./. ./
-RUN dotnet restore && dotnet build
-ENTRYPOINT ["bash", "-c", "dotnet run --urls http://0.0.0.0:80"]
\ No newline at end of file
+RUN dotnet restore "ChatRoomLocal.csproj"
+RUN dotnet build "ChatRoomLocal.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "ChatRoomLocal.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "ChatRoomLocal.dll", "--urls", "http://0.0.0.0:80"]
\ No newline at end of file
diff --git a/samples/GitHubChat/Dockerfile b/samples/GitHubChat/Dockerfile
index ebc81f94..8b350ccc 100644
--- a/samples/GitHubChat/Dockerfile
+++ b/samples/GitHubChat/Dockerfile
@@ -1,7 +1,17 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src/GitHubChat
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+WORKDIR /app
+EXPOSE 80
 
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src/
 COPY ./. ./
-RUN dotnet restore && dotnet build
+RUN dotnet restore "GitHubChat.csproj"
+RUN dotnet build "GitHubChat.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "GitHubChat.csproj" -c Release -o /app/publish
 
-ENTRYPOINT ["bash","-c", "dotnet run --GitHubClientId $GITHUB_CLIENT_ID --GitHubClientSecret $GITHUB_CLIENT_SECRET --urls http://0.0.0.0:80"]
\ No newline at end of file
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT dotnet GitHubChat.dll --urls http://0.0.0.0:80 --GitHubClientId $GITHUB_CLIENT_ID --GitHubClientSecret $GITHUB_CLIENT_SECRET
\ No newline at end of file