From 6461e319597e0e623f4aa3f9401d9137c263d089 Mon Sep 17 00:00:00 2001
From: andy <andy@sarsoo.xyz>
Date: Sun, 13 Feb 2022 12:40:30 +0000
Subject: [PATCH] containers building

---
 Dockerfile.CLI     | 9 ++++-----
 Dockerfile.Web     | 9 ++++-----
 docker-compose.yml | 8 ++++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.CLI b/Dockerfile.CLI
index 0e185b6..461c106 100644
--- a/Dockerfile.CLI
+++ b/Dockerfile.CLI
@@ -6,15 +6,14 @@ COPY Selector.Cache/*.csproj ./Selector.Cache/
 COPY Selector.Event/*.csproj ./Selector.Event/
 COPY Selector.Model/*.csproj ./Selector.Model/
 COPY Selector.CLI/*.csproj ./Selector.CLI/
-RUN dotnet restore
+RUN dotnet restore ./Selector.CLI/Selector.CLI.csproj
 
 COPY . ./
-RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release
-COPY ./Selector.CLI/bin/Release/net6.0/publish/ App/
+RUN dotnet publish Selector.CLI/Selector.CLI.csproj -c Release -o /app --no-restore
 
 FROM mcr.microsoft.com/dotnet/runtime:6.0
-COPY --from=build bin/Release/net6.0/publish/ App/
-WORKDIR /App
+WORKDIR /app
+COPY --from=build /app ./
 ENV DOTNET_EnableDiagnostics=0
 ENTRYPOINT ["dotnet", "Selector.CLI.dll"]
 
diff --git a/Dockerfile.Web b/Dockerfile.Web
index b6aef2f..f3ce30f 100644
--- a/Dockerfile.Web
+++ b/Dockerfile.Web
@@ -6,15 +6,14 @@ COPY Selector.Cache/*.csproj ./Selector.Cache/
 COPY Selector.Event/*.csproj ./Selector.Event/
 COPY Selector.Model/*.csproj ./Selector.Model/
 COPY Selector.Web/*.csproj ./Selector.Web/
-RUN dotnet restore
+RUN dotnet restore ./Selector.Web/Selector.Web.csproj
 
 COPY . ./
-RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release
-COPY ./Selector.Web/bin/Release/net6.0/publish/ App/
+RUN dotnet publish Selector.Web/Selector.Web.csproj -c Release -o /app --no-restore
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0
 EXPOSE 80
-COPY --from=build Selector.Web/bin/Release/net6.0/publish/ App/
-WORKDIR /App
+WORKDIR /app
+COPY --from=build /app ./
 ENV DOTNET_EnableDiagnostics=0
 ENTRYPOINT ["dotnet", "Selector.Web.dll"]
diff --git a/docker-compose.yml b/docker-compose.yml
index e7863a0..64b4545 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,15 @@
 version: "3.9"  # optional since v1.27.0
 services:
   web:
-    build: Selector.Web/
+    build: 
+      context: .
+      dockerfile: Dockerfile.Web
     ports:
       - "8080:80"
   cli:
-    build: Selector.CLI/
+    build: 
+      context: .
+      dockerfile: Dockerfile.CLI
   redis:
     image: redis:alpine
   database: