From 82d124fb4b189e5ec629bcb6e8daeab88dc841e9 Mon Sep 17 00:00:00 2001
From: KrzysztofPajak <krzysiek@nop4you.com>
Date: Fri, 4 Oct 2019 16:23:20 +0200
Subject: [PATCH] Further changes - Fixed the context in docker-compose for
 grand.web. Fixes issue #643 #647

---
 .dockerignore               | 25 +++++++++++++++++++++++++
 Grand.Web/Dockerfile        | 24 ++++++++++++++++++------
 docker-compose.ci.build.yml |  9 ---------
 docker-compose.dcproj       |  2 +-
 docker-compose.yml          |  4 ++--
 5 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 docker-compose.ci.build.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..3729ff0cd1
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
\ No newline at end of file
diff --git a/Grand.Web/Dockerfile b/Grand.Web/Dockerfile
index fb74fbdcdf..2a360887b3 100644
--- a/Grand.Web/Dockerfile
+++ b/Grand.Web/Dockerfile
@@ -1,11 +1,23 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0.0
-ARG source
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
 WORKDIR /app
 EXPOSE 80
-COPY ${source:-obj/Docker/publish} .
 
-RUN apt-get update && \
-  apt-get -y install libgdiplus
-RUN ln -s /lib/x86_64-linux-gnu/libdl.so.2 /lib/x86_64-linux-gnu/libdl.so
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
+WORKDIR /src
+COPY ["Grand.Web/Grand.Web.csproj", "Grand.Web/"]
+COPY ["Grand.Framework/Grand.Framework.csproj", "Grand.Framework/"]
+COPY ["Grand.Core/Grand.Core.csproj", "Grand.Core/"]
+COPY ["Grand.Services/Grand.Services.csproj", "Grand.Services/"]
+COPY ["Grand.Api/Grand.Api.csproj", "Grand.Api/"]
+RUN dotnet restore "Grand.Web/Grand.Web.csproj"
+COPY . .
+WORKDIR "/src/Grand.Web"
+RUN dotnet build "Grand.Web.csproj" -c Release -o /app/build
 
+FROM build AS publish
+RUN dotnet publish "Grand.Web.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "Grand.Web.dll"]
diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
deleted file mode 100644
index c170929504..0000000000
--- a/docker-compose.ci.build.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3.4'
-
-services:
-  ci-build:
-    image: microsoft/dotnet:3.0.100-sdk
-    volumes:
-      - .:/src
-    working_dir: /src
-    command: /bin/bash -c "dotnet restore ./GrandNode.sln && dotnet publish ./GrandNode.sln -c Release -o ./obj/Docker/publish"
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index 47ca3fd815..0243850e26 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -9,7 +9,7 @@
     <DockerServiceName>grand.web</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose.ci.build.yml" />
+    <None Include=".dockerignore" />
     <None Include="docker-compose.override.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
     </None>
diff --git a/docker-compose.yml b/docker-compose.yml
index fcb8eb039c..e55e5a1746 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   grand.web:
-    image: grand.web
+    image: ${DOCKER_REGISTRY-}grandweb
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Grand.Web/Dockerfile