Update build

.drone.yml

@@ -2,18 +2,8 @@ kind: pipeline
 name: default
 
 steps:
-  - name: build_frontend
-    image: docker:latest
-    depends_on: [ clone ]
-    volumes:
-      - name: docker_sock
-        path: /var/run/docker.sock
-    commands:
-      - docker build --no-cache -t geen-frontend:2.0.0.$$DRONE_BUILD_NUMBER -f "build/Frontend.Dockerfile" .
-
   - name: build_web
     image: docker:latest
-    depends_on: [ build_frontend ]
     volumes:
       - name: docker_sock
         path: /var/run/docker.sock
@@ -52,7 +42,7 @@ steps:
       - name: docker_sock
         path: /var/run/docker.sock
     commands:
-      - docker run -d -p 172.17.0.1:7000:7000 --volume /home/zoxexivo/static/htmls:/html/geen --restart always --name geen-web geen-web:2.0.0.$$DRONE_BUILD_NUMBER
+      - docker run -d -p 172.17.0.1:7000:7000 --restart always --name geen-web geen-web:2.0.0.$$DRONE_BUILD_NUMBER
       - docker run -d --restart always --name geen-jobs geen-jobs:2.0.0.$$DRONE_BUILD_NUMBER
 
 volumes:

build/Web.Dockerfile

@@ -1,20 +1,33 @@
+FROM node:17-alpine3.14 AS build-frontend
+
+WORKDIR /app
+
+COPY ./src/Frontend/package.json .
+
+RUN npm install --legacy-peer-deps
+
+COPY ./src/Frontend/ .
+
+RUN npm run build
+
 ARG BUILD_NUMBER
 
 FROM geen-frontend:$BUILD_NUMBER as frontend
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-backend
 
 WORKDIR /app
 
 COPY ./src/Backend/ ./
 
 WORKDIR /app/Geen.Web
 
-COPY --from=frontend /app/dist wwwroot
-
 RUN dotnet publish -c Release -o /app/out -r linux-x64 --self-contained true /p:PublishReadyToRun=true /p:PublishSingleFile=true --packages packages
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:7.0 AS runtime
 WORKDIR /app
-COPY --from=build /app/out .
+
+COPY --from=build-backend /app/out .
+COPY --build-frontend=frontend /app/dist wwwroot
+
 ENTRYPOINT ["./Geen.Web"]

src/Backend/Geen.sln

@@ -12,7 +12,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{91552B37-1D7C-4556-B5B2-65E6055C595F}"
 ProjectSection(SolutionItems) = preProject
 	..\..\build\Web.Dockerfile = ..\..\build\Web.Dockerfile
-	..\..\build\Frontend.Dockerfile = ..\..\build\Frontend.Dockerfile
 	..\..\build\Jobs.Dockerfile = ..\..\build\Jobs.Dockerfile
 EndProjectSection
 EndProject