From dd31c7da5c277fc2ec9b37c69347df68cbd7cf53 Mon Sep 17 00:00:00 2001
From: James Chapman <jchapman3000@gmail.com>
Date: Fri, 11 Aug 2023 22:15:01 +0100
Subject: [PATCH] Improve layer caching in Docker build

---
 .config/dotnet-tools.json  | 12 ++++++++++++
 .dockerignore              | 10 ++++++++++
 Dockerfile                 | 19 +++++++++++++++++--
 Groceries.sln              |  1 +
 Groceries/Groceries.csproj |  1 -
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 .config/dotnet-tools.json
 create mode 100644 .dockerignore

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..1a5dc01
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "microsoft.web.librarymanager.cli": {
+      "version": "2.1.175",
+      "commands": [
+        "libman"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..9fd8b0a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.git/
+.github/
+.vs/
+.vscode/
+**/bin/
+**/obj/
+*.csproj.user
+
+Groceries/wwwroot/lib/
+Groceries/config_development.ini
diff --git a/Dockerfile b/Dockerfile
index b93baf0..44e2193 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,32 @@
 FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
 WORKDIR /src
-COPY . ./
-WORKDIR Groceries
+
+COPY ./.config ./
+RUN dotnet tool restore
+
+COPY ./Groceries.sln ./
+COPY */*.csproj ./
+RUN for file in $(ls *.csproj); do mkdir -p ${file%.*} && mv $file ${file%.*}; done
 RUN dotnet restore
+
+COPY ./Groceries/libman.json ./
+WORKDIR Groceries
+RUN dotnet libman restore
+
+COPY . ../
 RUN dotnet publish --no-restore --output /out
 
 FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
 WORKDIR /groceries
+
 COPY --from=build /out .
 COPY --from=build /src/Groceries/config.ini /config/
+
 RUN apk add --no-cache icu-libs tzdata
+
 ENV DOTNET_ENABLEDIAGNOSTICS=0
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
+
 EXPOSE 80
 VOLUME /config
 ENTRYPOINT ["./Groceries", "--data", "/config"]
diff --git a/Groceries.sln b/Groceries.sln
index 1a959fb..c52ad4a 100644
--- a/Groceries.sln
+++ b/Groceries.sln
@@ -9,6 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Groceries.Data", "Groceries
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3B5FF09-44D2-491B-9663-0962BE0D1EBE}"
 	ProjectSection(SolutionItems) = preProject
+		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		Dockerfile = Dockerfile
diff --git a/Groceries/Groceries.csproj b/Groceries/Groceries.csproj
index e59bc24..9e02448 100644
--- a/Groceries/Groceries.csproj
+++ b/Groceries/Groceries.csproj
@@ -13,7 +13,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.9" />
-        <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
     </ItemGroup>
 
     <ItemGroup>