App logo

Reviewed-on: #2

.gitea/workflows/build.yml

@@ -1,85 +1,57 @@
-name: BuildApp
+name: Build Docker Images
 
 on:
-  workflow_dispatch: {}
   push:
     branches:
       - main
-      
+  workflow_dispatch: {}
+
 concurrency:
   group: build-${{ github.ref }}
   cancel-in-progress: false
 
 jobs:
-  build-frontend:
+  test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: https://github.com/actions/checkout@v4
 
-      - name: Use Node.js 20
+      - name: Setup .NET 10
-        uses: https://github.com/actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install Angular CLI
-        run: npm install -g @angular/cli
-
-      - name: Install PNPM
-        run: npm install -g pnpm
-
-      - name: Install dependencies
-        working-directory: src/Frontend
-        run: pnpm install
-
-      - name: Build Angular
-        working-directory: src/Frontend
-        run: ng build --configuration=production
-
-      - name: Upload artifact (frontend)
-        uses: https://github.com/actions/upload-artifact@v3
-        with:
-          name: frontend
-          path: src/Frontend/dist
-          if-no-files-found: error
-          retention-days: 7
-
-  build-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Setup .NET 8
         uses: https://github.com/actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
 
       - name: Restore dependencies
-        working-directory: src/Backend
+        working-directory: .
-        run: dotnet restore DiunaBI.sln
+        run: |
+          dotnet restore DiunaBI.API/DiunaBI.API.csproj
+          dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj
+          dotnet restore DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj
+          dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj
 
       - name: Build solution and prepare plugins
-        working-directory: src/Backend
+        working-directory: .
         run: |
           set -e
-          dotnet build DiunaBI.sln --configuration Release
+          # Build only required projects — skip DiunaBI.UI.Mobile
+          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release
+          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release
           dotnet build DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj --configuration Release
-          mkdir -p DiunaBI.Tests/bin/Release/net8.0/Plugins
+
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          mkdir -p DiunaBI.Tests/bin/Release/net10.0/Plugins
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Core.dll DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          cp DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-          ls -la DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          ls -la DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
 
       - name: Run Tests
-        working-directory: src/Backend
+        working-directory: .
         run: |
-          dotnet add DiunaBI.Tests/DiunaBI.Tests.csproj package coverlet.collector
           dotnet test DiunaBI.Tests/DiunaBI.Tests.csproj \
             --configuration Release \
             --no-restore \
             --logger "trx;LogFileName=test-results.trx" \
             --collect:"XPlat Code Coverage" \
-            --filter "Category!=LocalOnly"
+            --filter "Category!=LocalOnly" || true
 
       - name: Publish Test Results
         uses: https://github.com/actions/upload-artifact@v3
@@ -87,33 +59,72 @@ jobs:
         with:
           name: test-results
           path: |
-            src/Backend/DiunaBI.Tests/TestResults/*.trx
+            DiunaBI.Tests/TestResults/*.trx
-            src/Backend/DiunaBI.Tests/TestResults/**/coverage.cobertura.xml
+            DiunaBI.Tests/TestResults/**/coverage.cobertura.xml
           retention-days: 7
 
-      - name: Publish WebAPI
+  build-and-push:
-        if: success()
+    runs-on: ubuntu-latest
-        working-directory: src/Backend
+    needs: test
+    if: success() || failure()
+    
+    steps:
+      - name: Debug secrets
         run: |
-          dotnet publish DiunaBI.WebAPI/DiunaBI.WebAPI.csproj \
+          echo "User length: ${#REGISTRY_USER}"
-            --configuration Release \
+          echo "Token length: ${#REGISTRY_TOKEN}"
-            --framework net8.0 \
+        env:
-            --self-contained false \
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-            --output ../../build/webapi
+          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-          mkdir -p ../../build/webapi/Plugins
+        
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Plugins.Morska.dll ../../build/webapi/Plugins/
+      - name: Checkout code
-          ls -la ../../build/webapi/Plugins/
+        uses: https://github.com/actions/checkout@v4
 
-      - name: Clean up sensitive files
+      - name: Set up Docker Buildx
-        working-directory: build/webapi
+        uses: https://github.com/docker/setup-buildx-action@v3
+
+      - name: Log in to Gitea Container Registry
         run: |
-          rm -f appsettings.Development.json || true
+          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-          rm -f client_secrets.Development.json || true
 
-      - name: Upload artifact (webapi)
+      - name: Build and push API image
-        uses: https://github.com/actions/upload-artifact@v3
+        working-directory: .
-        with:
+        run: |
-          name: webapi
+          docker buildx build \
-          path: build/webapi
+            --platform linux/amd64 \
-          if-no-files-found: error
+            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-          retention-days: 7
+            -f DiunaBI.API/Dockerfile \
+            -t code.bim-it.pl/mz/diunabi-api:latest \
+            -t code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }} \
+            --push \
+            .
+
+      - name: Build and push UI image
+        working-directory: .
+        run: |
+          docker buildx build \
+            --platform linux/amd64 \
+            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
+            -f DiunaBI.UI.Web/Dockerfile \
+            -t code.bim-it.pl/mz/diunabi-ui:latest \
+            -t code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }} \
+            --push \
+            .
+
+      - name: Output build info
+        run: |
+          echo "## 🐳 Docker Images Built" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Images pushed:" >> $GITHUB_STEP_SUMMARY
+          echo '```bash' >> $GITHUB_STEP_SUMMARY
+          echo "# Latest (for release)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-api:latest" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-ui:latest" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "# Specific build (for rollback)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY

.gitea/workflows/buildContainers.yml

@@ -1,130 +0,0 @@
-name: Build Docker Images
-
-on:
-  push:
-    branches:
-      - ddd-refactor
-  workflow_dispatch: {}
-
-concurrency:
-  group: build-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Setup .NET 10
-        uses: https://github.com/actions/setup-dotnet@v4
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Restore dependencies
-        working-directory: src/Backend
-        run: |
-          dotnet restore DiunaBI.API/DiunaBI.API.csproj
-          dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj
-          dotnet restore DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj
-          dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj
-
-      - name: Build solution and prepare plugins
-        working-directory: src/Backend
-        run: |
-          set -e
-          # Build only required projects — skip DiunaBI.UI.Mobile
-          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release
-          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release
-          dotnet build DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj --configuration Release
-
-          mkdir -p DiunaBI.Tests/bin/Release/net10.0/Plugins
-          cp DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-          ls -la DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-
-      - name: Run Tests
-        working-directory: src/Backend
-        run: |
-          dotnet test DiunaBI.Tests/DiunaBI.Tests.csproj \
-            --configuration Release \
-            --no-restore \
-            --logger "trx;LogFileName=test-results.trx" \
-            --collect:"XPlat Code Coverage" \
-            --filter "Category!=LocalOnly" || true
-
-      - name: Publish Test Results
-        uses: https://github.com/actions/upload-artifact@v3
-        if: success() || failure()
-        with:
-          name: test-results
-          path: |
-            src/Backend/DiunaBI.Tests/TestResults/*.trx
-            src/Backend/DiunaBI.Tests/TestResults/**/coverage.cobertura.xml
-          retention-days: 7
-
-  build-and-push:
-    runs-on: ubuntu-latest
-    needs: test
-    if: success() || failure()
-    
-    steps:
-      - name: Debug secrets
-        run: |
-          echo "User length: ${#REGISTRY_USER}"
-          echo "Token length: ${#REGISTRY_TOKEN}"
-        env:
-          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-        
-      - name: Checkout code
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: https://github.com/docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        run: |
-          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-
-      - name: Build and push API image
-        working-directory: src/Backend
-        run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-            -f DiunaBI.API/Dockerfile \
-            -t code.bim-it.pl/mz/diunabi-api:latest \
-            -t code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }} \
-            --push \
-            .
-
-      - name: Build and push UI image
-        working-directory: src/Backend
-        run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-            -f DiunaBI.UI.Web/Dockerfile \
-            -t code.bim-it.pl/mz/diunabi-ui:latest \
-            -t code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }} \
-            --push \
-            .
-
-      - name: Output build info
-        run: |
-          echo "## 🐳 Docker Images Built" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Images pushed:" >> $GITHUB_STEP_SUMMARY
-          echo '```bash' >> $GITHUB_STEP_SUMMARY
-          echo "# Latest (for release)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-api:latest" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-ui:latest" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# Specific build (for rollback)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY

.gitea/workflows/morskaRelease.yml

@@ -1,122 +0,0 @@
-name: ReleaseApp (JS finder + download)
-
-on:
-  workflow_dispatch: {}
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    env:
-      GITEA_BASE_URL: https://code.bim-it.pl
-      OWNER: mz
-      REPO: DiunaBI
-      REQUIRED_ARTIFACTS: frontend,webapi
-      SCAN_LIMIT: "100"
-
-    steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Use Node.js 20
-        uses: https://github.com/actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install unzip (for extraction)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y unzip
-
-      - name: Resolve latest run that exposes required artifacts
-        id: resolve
-        env:
-          GITEA_PAT: ${{ secrets.GITEATOKEN }}
-        run: |
-          node .gitea/scripts/getLatestRunWithArtifacts.js
-          echo "Resolved run_id: $(cat .gitea/.cache/run_id)"
-          echo "run_id=$(cat .gitea/.cache/run_id)" >> "$GITHUB_OUTPUT"
-
-      - name: Download frontend artifact
-        env:
-          GITEA_PAT: ${{ secrets.GITEATOKEN }}
-          ARTIFACT_NAME: frontend
-          RUN_ID: ${{ steps.resolve.outputs.run_id }}
-          OUTPUT_DIR: artifacts/frontend
-        run: |
-          node .gitea/scripts/downloadArtifactByName.js
-
-      - name: Download webapi artifact
-        env:
-          GITEA_PAT: ${{ secrets.GITEATOKEN }}
-          ARTIFACT_NAME: webapi
-          RUN_ID: ${{ steps.resolve.outputs.run_id }}
-          OUTPUT_DIR: artifacts/webapi
-        run: |
-          node .gitea/scripts/downloadArtifactByName.js
-
-      - name: Show artifact structure
-        run: |
-          echo "::group::frontend"
-          ls -laR artifacts/frontend || true
-          echo "::endgroup::"
-          echo "::group::webapi"
-          ls -laR artifacts/webapi || true
-          echo "::endgroup::"
-          
-      - name: Tokenize (replace #{...}# from secrets/vars)
-        env:
-          SECRETS: ${{ toJson(secrets) }}
-          VARIABLES: ${{ toJson(vars) }}
-          RUN_ID: ${{ steps.resolve.outputs.run_id }}
-        run: |
-            set -euo pipefail
-            node .gitea/scripts/replaceTokens.js
-          
-      - name: Package artifacts as ZIPs
-        run: |
-          mkdir -p build
-          (cd artifacts/frontend && zip -rq ../../build/DiunaBI-Morska-Frontend.zip .)
-          (cd artifacts/webapi && zip -rq ../../build/DiunaBI-Morska-WebApi.zip .)
-          ls -la build
-          
-      - name: Upload artifacts to remote server
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.GITEARUNNER_SSH_KEY }}
-          SSH_USER: mz
-          SSH_HOST: bim-it.pl
-          REMOTE_DIR: deployment
-        run: |
-          set -euo pipefail
-          
-          umask 077
-          echo "$SSH_PRIVATE_KEY" > private_key
-          chmod 600 private_key
-          
-          mkdir -p ~/.ssh
-          ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts
-          
-          ssh -i private_key "$SSH_USER@$SSH_HOST" "mkdir -p ~/$REMOTE_DIR"
-          
-          scp -i private_key build/DiunaBI-Morska-Frontend.zip "$SSH_USER@$SSH_HOST:~/$REMOTE_DIR/"
-          scp -i private_key build/DiunaBI-Morska-WebApi.zip "$SSH_USER@$SSH_HOST:~/$REMOTE_DIR/"
-          
-          shred -u private_key
-          
-      - name: Run release script on remote server
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.GITEARUNNER_SSH_KEY }}
-          SSH_USER: mz
-          SSH_HOST: bim-it.pl
-        run: |
-          set -euo pipefail
-
-          umask 077
-          echo "$SSH_PRIVATE_KEY" > private_key
-          chmod 600 private_key
-
-          mkdir -p ~/.ssh
-          ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts
-
-          ssh -i private_key "$SSH_USER@$SSH_HOST" "./deployment/DiunaBI-Morska.Release.sh"
-
-          shred -u private_key

DiunaBI.API/Dockerfile

@@ -1,7 +1,7 @@
 
 # Stage 1: Build
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
-WORKDIR /src/Backend
+WORKDIR /
 
 # Copy solution and all project files for restore
 COPY DiunaBI.sln ./
@@ -18,16 +18,16 @@ RUN dotnet restore DiunaBI.API/DiunaBI.API.csproj
 COPY . .
 
 # Build plugin first
-WORKDIR /src/Backend/DiunaBI.Plugins.Morska
+WORKDIR /DiunaBI.Plugins.Morska
 RUN dotnet build -c Release
 
 # Build and publish API
-WORKDIR /src/Backend/DiunaBI.API
+WORKDIR /DiunaBI.API
 RUN dotnet publish -c Release -o /app/publish --no-restore
 
 # Copy plugin DLL to publish output
 RUN mkdir -p /app/publish/Plugins && \
-    cp /src/Backend/DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll /app/publish/Plugins/
+    cp /DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll /app/publish/Plugins/
 
 # Stage 2: Runtime
 FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime