update ci

fullstackhero · Oct 22, 2024 · 1500c59 · 1500c59
1 parent 57605d9
commit 1500c59
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/blazor.yml b/.github/workflows/blazor.yml
@@ -1,4 +1,4 @@
-name: Blazor
+name: blazor
 
 on:
   workflow_dispatch:
@@ -9,13 +9,15 @@ on:
     paths:
       - "src/apps/blazor/**"
       - "src/Directory.Packages.props"
+      - "src/Dockerfile.Blazor"
 
   pull_request:
     branches:
       - main
     paths:
       - "src/apps/blazor/**"
       - "src/Directory.Packages.props"
+      - "src/Dockerfile.Blazor"
 
 jobs:
   build:
@@ -47,7 +49,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: build and publish to github container registry
-        working-directory: ./src/apps/blazor/
+        working-directory: ./src/
         run: |
-          docker build -t ghcr.io/${{ github.repository_owner }}/blazor:latest -f Dockerfile .
+          docker build -t ghcr.io/${{ github.repository_owner }}/blazor:latest -f Dockerfile.Blazor .
           docker push ghcr.io/${{ github.repository_owner }}/blazor:latest
diff --git a/.github/workflows/webapi.yml b/.github/workflows/webapi.yml
@@ -1,4 +1,4 @@
-name: WebAPI
+name: webapi
 
 on:
   workflow_dispatch:

diff --git a/src/apps/blazor/.dockerignore → src/.dockerignore b/src/apps/blazor/.dockerignore → src/.dockerignore
diff --git a/src/apps/blazor/Dockerfile → src/Dockerfile.Blazor b/src/apps/blazor/Dockerfile → src/Dockerfile.Blazor
@@ -2,12 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
 COPY . ./
-RUN dotnet publish ./client/Client.csproj -c Release -o output
+RUN dotnet publish ./apps/blazor/client/Client.csproj -c Release -o output
 
 FROM nginx:alpine
 WORKDIR /usr/share/nginx/html
 COPY --from=build-env /app/output/wwwroot .
 
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY ./apps/blazor/nginx.conf /etc/nginx/nginx.conf
 
 EXPOSE 80
diff --git a/src/FSH.Starter.sln b/src/FSH.Starter.sln
@@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Todo", "Todo", "{79981A5A-2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Framework", "_Framework", "{05248A38-0F34-4E59-A3D1-B07097987AFB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{32F5383E-4201-4527-98DB-40715BB9F574}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Migrations", "Migrations", "{12F8343D-20A6-4E24-B0F5-3A66F2228CF6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebApi", "WebApi", "{CE64E92B-E088-46FB-9028-7FB6B67DEC55}"
@@ -258,7 +256,6 @@ Global
 		{93324D12-DE1B-4C1B-934A-92AA140FF6F6} = {F3DF5AC5-8CDC-46D4-969D-1245A6880215}
 		{79981A5A-207A-4A16-A21B-5E80394082F6} = {F3DF5AC5-8CDC-46D4-969D-1245A6880215}
 		{05248A38-0F34-4E59-A3D1-B07097987AFB} = {CE64E92B-E088-46FB-9028-7FB6B67DEC55}
-		{32F5383E-4201-4527-98DB-40715BB9F574} = {F3DF5AC5-8CDC-46D4-969D-1245A6880215}
 		{12F8343D-20A6-4E24-B0F5-3A66F2228CF6} = {CE64E92B-E088-46FB-9028-7FB6B67DEC55}
 		{294D6FF8-9379-4AB8-A203-8D0CC85FBFBB} = {05248A38-0F34-4E59-A3D1-B07097987AFB}
 		{A1D828E4-6B83-4BA2-B8E9-B21CE3BE8A31} = {05248A38-0F34-4E59-A3D1-B07097987AFB}