1 files changed, 16 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 5be1d333..b9b958b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,16 @@
-FROM crupest/timeline-build-env:latest AS build
-WORKDIR /timeline-app
-COPY . .
-RUN dotnet publish Timeline/Timeline.csproj --configuration Release --output ./Timeline/publish/ -r linux-x64 --self-contained false
-
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
-WORKDIR /app
-ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED true
-COPY --from=build /timeline-app/Timeline/publish .
-ENTRYPOINT ["dotnet", "Timeline.dll"]
+FROM node:latest AS front-build
+WORKDIR /timeline-app
+COPY FrontEnd .
+RUN yarn build
+
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS back-build
+WORKDIR /timeline-app
+COPY BackEnd .
+COPY --from=front-build /timeline-app/dist /timeline-app/Timeline/ClientApp
+RUN dotnet publish Timeline/Timeline.csproj --configuration Release --output ./Timeline/publish/ -r linux-x64 --self-contained false
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
+WORKDIR /app
+ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED true
+COPY --from=back-build /timeline-app/Timeline/publish .
+ENTRYPOINT ["dotnet", "Timeline.dll"]