in docker builds

Author: LucHeart

.dockerignore

@@ -0,0 +1,5 @@
+bin/
+obj/
+.idea
+*.DotSettings.user
+.vs

.github/workflows/ci-build.yml

@@ -8,10 +8,6 @@ on:
     types: [ opened, reopened, synchronize ]
   workflow_call:
     inputs:
-      platforms:
-        description: 'Platforms to build for'
-        required: false
-        type: string
       latest:
         description: 'Tag image as latest'
         required: false
@@ -99,37 +95,13 @@ jobs:
           if-no-files-found: error
 
 
-  build-linux-web:
+  build-linux-web-containers:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup .NET SDK ${{ env.DOTNET_VERSION }}
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-
-      - name: Cache NuGet packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.nuget/packages
-          key: linux-web-nuget
-          restore-keys: |
-            linux-web-nuget
-
-      - name: Publish OpenShock Web
-        run: dotnet publish Desktop/Desktop.csproj -c Release-Web -o ./publish/Web-Linux
-        
-      - name: Upload OpenShock Desktop Web Linux artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: OpenShock Desktop Web Linux
-          path: publish/Web-Linux/*
-          retention-days: 7
-          if-no-files-found: error
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -165,11 +137,19 @@ jobs:
           push: ${{ inputs.latest || inputs.rc || (github.ref_protected && github.event_name != 'pull_request') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: ${{ inputs.platforms || 'linux/amd64' }}
+          platforms: 'linux/amd64,linux/arm64'
           cache-from: |
             type=gha
           cache-to: |
             type=gha
+            
+      - name: Upload OpenShock Desktop Web Linux artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenShock Desktop Web Linux
+          path: publish/Web-Linux/*
+          retention-days: 7
+          if-no-files-found: error
 
   build-linux-photino:
     runs-on: ubuntu-latest

.github/workflows/ci-tag.yml

@@ -48,6 +48,5 @@ jobs:
     needs: [get-latest-tag, get-latest-rc-tag]
     uses: ./.github/workflows/ci-build.yml
     with:
-      platforms: linux/amd64,linux/arm64
       latest: ${{ needs.get-latest-tag.outputs.latest-tag == github.ref_name }}
       rc: ${{ needs.get-latest-rc-tag.outputs.latest-rc == github.ref_name }}

Dockerfile

@@ -1,4 +1,14 @@
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim AS runtime
+FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim AS build
+WORKDIR /src
+COPY --link Desktop/*.csproj Desktop/
+COPY --link ModuleBase/*.csproj ModuleBase/
+
+RUN dotnet restore Desktop/Desktop.csproj /p:Configuration=Release-Web
+
+COPY . .
+RUN dotnet publish Desktop/Desktop.csproj -c Release-Web -o /publish/Web-Linux
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim AS runtime
 WORKDIR /app
 LABEL org.opencontainers.image.authors="team@openshock.org"
 
@@ -7,6 +17,6 @@ ENV OPENSHOCK_DATA_FOLDER=/data
 ENV HOME=$OPENSHOCK_DATA_FOLDER
 VOLUME ["/data"]
 
-COPY --link ./publish/Web-Linux .
+COPY --link --from=build ./publish/Web-Linux .
 
 ENTRYPOINT ["dotnet", "OpenShock.Desktop.dll"]