docker: revert all chanegs to dockerfile

streetwriters · Jul 31, 2024 · d4b0f7c · d4b0f7c
1 parent 3ebfc8d
commit d4b0f7c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/Notesnook.API/Dockerfile b/Notesnook.API/Dockerfile
@@ -2,15 +2,22 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 WORKDIR /app
 
-ADD . /app
+# copy projects
+COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
+COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
+COPY Notesnook.API/*.csproj ./Notesnook.API/
 
-# restore all project dependencies
-RUN dotnet restore -v d ./Notesnook.sln
+# restore dependencies
+RUN dotnet restore -v d /app/Notesnook.API/Notesnook.API.csproj --use-current-runtime
+
+# copy everything else
+COPY Streetwriters.Data/ ./Streetwriters.Data/
+COPY Streetwriters.Common/ ./Streetwriters.Common/
+COPY Notesnook.API/ ./Notesnook.API/
 
 WORKDIR /app/Notesnook.API/
-# build
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --self-contained false --no-restore /p:Runtimeidentifier=linux-x64
+RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0

diff --git a/Streetwriters.Identity/Dockerfile b/Streetwriters.Identity/Dockerfile
@@ -2,15 +2,22 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 WORKDIR /app
 
-ADD . /app
+# copy projects
+COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
+COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
+COPY Streetwriters.Identity/*.csproj ./Streetwriters.Identity/
 
-# restore all project dependencies
-RUN dotnet restore -v d ./Notesnook.sln
+# restore dependencies
+RUN dotnet restore -v d /app/Streetwriters.Identity/Streetwriters.Identity.csproj --use-current-runtime
+
+# copy everything else
+COPY Streetwriters.Data/ ./Streetwriters.Data/
+COPY Streetwriters.Common/ ./Streetwriters.Common/
+COPY Streetwriters.Identity/ ./Streetwriters.Identity/
 
 WORKDIR /app/Streetwriters.Identity/
-# build
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --self-contained false --no-restore /p:Runtimeidentifier=linux-x64
+RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0

diff --git a/Streetwriters.Messenger/Dockerfile b/Streetwriters.Messenger/Dockerfile
@@ -2,15 +2,22 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 WORKDIR /app
 
-ADD . /app
+# copy projects
+COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
+COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
+COPY Streetwriters.Messenger/*.csproj ./Streetwriters.Messenger/
 
-# restore all project dependencies
-RUN dotnet restore -v d ./Notesnook.sln
+# restore dependencies
+RUN dotnet restore -v d /app/Streetwriters.Messenger/Streetwriters.Messenger.csproj --use-current-runtime
+
+# copy everything else
+COPY Streetwriters.Data/ ./Streetwriters.Data/
+COPY Streetwriters.Common/ ./Streetwriters.Common/
+COPY Streetwriters.Messenger/ ./Streetwriters.Messenger/
 
 WORKDIR /app/Streetwriters.Messenger/
-# build
 ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-RUN dotnet publish -c Release -o /app/out --self-contained false --no-restore /p:Runtimeidentifier=linux-x64
+RUN dotnet publish -c Release -o /app/out --use-current-runtime --self-contained false --no-restore
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0