diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 7c49eea..bdcf217 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -23,7 +23,7 @@ jobs: dotnet-version: 10.0.x - name: Restore dependencies - working-directory: src/Backend + working-directory: . run: | dotnet restore DiunaBI.API/DiunaBI.API.csproj dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj @@ -31,7 +31,7 @@ jobs: dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj - name: Build solution and prepare plugins - working-directory: src/Backend + working-directory: . run: | set -e # Build only required projects — skip DiunaBI.UI.Mobile @@ -44,7 +44,7 @@ jobs: ls -la DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true - name: Run Tests - working-directory: src/Backend + working-directory: . run: | dotnet test DiunaBI.Tests/DiunaBI.Tests.csproj \ --configuration Release \ @@ -59,8 +59,8 @@ jobs: with: name: test-results path: | - src/Backend/DiunaBI.Tests/TestResults/*.trx - src/Backend/DiunaBI.Tests/TestResults/**/coverage.cobertura.xml + DiunaBI.Tests/TestResults/*.trx + DiunaBI.Tests/TestResults/**/coverage.cobertura.xml retention-days: 7 build-and-push: @@ -88,7 +88,7 @@ jobs: 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 + working-directory: . run: | docker buildx build \ --platform linux/amd64 \ @@ -100,7 +100,7 @@ jobs: . - name: Build and push UI image - working-directory: src/Backend + working-directory: . run: | docker buildx build \ --platform linux/amd64 \ diff --git a/DiunaBI.API/Dockerfile b/DiunaBI.API/Dockerfile index 4f05af9..18635c3 100644 --- a/DiunaBI.API/Dockerfile +++ b/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 diff --git a/DiunaBI.UI.Web/Dockerfile b/DiunaBI.UI.Web/Dockerfile index b0dfafe..5d8b17d 100644 --- a/DiunaBI.UI.Web/Dockerfile +++ b/DiunaBI.UI.Web/Dockerfile @@ -1,6 +1,6 @@ # 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 ./ @@ -16,7 +16,7 @@ RUN dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj COPY . . # Build and publish -WORKDIR /src/Backend/DiunaBI.UI.Web +WORKDIR /DiunaBI.UI.Web RUN dotnet publish -c Release -o /app/publish --no-restore # Stage 2: Runtime