Update .woodpecker.yml

Reviewed-on: http://git.modwad.pl/FA/FA_WEB/pulls/3

.woodpecker.yml

@@ -1,33 +1,31 @@
 skip_clone: true
-
+when:
-wwhen:
+  event: pull_request
-  event: push
+  action:
+    - merge
   branch: master
-
 steps:
   debug-location:
     image: alpine
     commands:
-      - pwd                           # gdzie aktualnie jesteśmy
+      - pwd
-      - ls -la                        # co jest w bieżącym katalogu
+      - ls -la
       - find /woodpecker -maxdepth 4 -type d 2>/dev/null
   clone-manual:
     image: woodpeckerci/plugin-git
     settings:
-      remote: http://gitea:3000/FA/FA_WEB.git
+      remote: http://gitea:3000/${CI_REPO}.git
-      branch: master
+      branch: ${CI_COMMIT_BRANCH}
       depth: 1
-
   restore:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
       - |
         set -euf
         cd "${CI_WORKSPACE}"
-        echo "Aktualna ścieżka: $(pwd)"
+        echo "Aktualna ścieżka do pliku: $(pwd)"
         echo "=== Restore wszystkich projektów ==="
         find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
-
   test:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
@@ -37,7 +35,6 @@ steps:
         echo "=== Uruchamianie testów ==="
         dotnet test --no-restore --configuration Release --logger "trx"
     depends_on: [restore]
-
   pack-datamodels:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
@@ -52,15 +49,11 @@ steps:
           --minimum-major-minor 2.0 \
           --default-pre-release-identifiers alpha.0 \
           --verbosity info)
-       
         echo "Wersja: $MINVER_VERSION"
-     
         mkdir -p nupkg
         echo "=== Pełniejsze fetch git (unshallow + tags) ==="
         git fetch --prune --unshallow || echo "Już full clone – OK"
         git fetch --tags
-       
-        # Diagnostyka – sprawdź czy tag jest widoczny
         echo "=== Dostępne tagi ==="
         git tag -l
         echo "=== Aktualny commit i opis ==="
@@ -79,13 +72,58 @@ steps:
               /p:PackageVersion=$MINVER_VERSION
           else
             PROJECT_NAME=$(basename "$csproj" .csproj)
-            echo "→ Pomijam $PROJECT_NAME – brak <PackageId> (nie jest to biblioteka NuGet)"
+            echo "→ Pomijam $PROJECT_NAME – brak <PackageId>"
           fi
         done
-        echo "=== Spakowane pakiety (.nupkg) ==="
+        echo "=== Spakowane pakiety ==="
         ls -la nupkg/ || echo "Brak spakowanych pakietów!"
     depends_on: [test]
+  
+  publish-linux-local:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        mkdir -p linux-apps
 
+        echo "=== Konfiguracja NuGet sources ==="
+        cat <<EOF > NuGet.Config
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+            <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+            <add key="BaGet" value="http://baget:80/v3/index.json" allowInsecureConnections="true" />
+          </packageSources>
+        </configuration>
+        EOF
+        
+        echo "=== Publikacja aplikacji LinuxLocal ==="
+        find . -name "*.csproj" -type f | while read csproj; do
+          PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
+        
+          if [ "$PROJECT_TYPE" = "LinuxLocal" ]; then
+            PROJECT_NAME=$(basename "$csproj" .csproj)
+            echo "→ Publishing $PROJECT_NAME"
+        
+            dotnet publish "$csproj" \
+              --configuration Release \
+              --output "./linux-apps/$PROJECT_NAME" \
+              --runtime linux-x64 \
+              --self-contained false
+          fi
+        done
+        
+        echo ""
+        if [ -d "./linux-apps" ] && [ "$(ls -A ./linux-apps)" ]; then
+          echo "Opublikowane aplikacje:"
+          ls -la linux-apps/
+        else
+          echo "Brak aplikacji LinuxLocal do publikacji"
+        fi
+    depends_on: [restore]
+  
   publish-datamodels-to-baget:
     image: mcr.microsoft.com/dotnet/sdk:latest
     environment:
@@ -97,7 +135,6 @@ steps:
         cd "${CI_WORKSPACE}"
         echo "=== Test połączenia z BaGetter ==="
         curl -f http://baget:80/v3/index.json || echo "Nie można połączyć się z BaGetter!"
-        # Tworzymy minimalny NuGet.Config tylko po to, żeby odblokować HTTP dla nazwanego źródła
         cat <<EOF > NuGet.Config
         <?xml version="1.0" encoding="utf-8"?>
         <configuration>
@@ -108,8 +145,6 @@ steps:
           </packageSources>
         </configuration>
         EOF
-        echo "=== Użyty NuGet.Config (tylko do odblokowania HTTP) ==="
-        cat NuGet.Config
         echo "=== Publikacja pakietów do BaGetter ==="
         find ./nupkg -name "*.nupkg" -type f | while read pkg; do
           echo "→ Push $(basename "$pkg")"
@@ -118,35 +153,213 @@ steps:
             --api-key "$BAGETTER_API_KEY" \
             --skip-duplicate
         done
-        echo "Wszystkie pakiety DataModel opublikowane w BaGetter!"
     depends_on: [pack-datamodels]
-
+  
-  build-and-publish-apps:
+  select-projects-for-container:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
       - |
         set -euf
         cd "${CI_WORKSPACE}"
-        echo "=== Ponowny restore aplikacji (z najnowszymi pakietami z BaGetter) ==="
+        > projects-to-build.txt
-        find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
+        
-        echo "=== Publish aplikacji ==="
+        echo "=== Selekcja projektów do konteneryzacji ==="
         find . -name "*.csproj" -type f | while read csproj; do
           PROJECT_NAME=$(basename "$csproj" .csproj)
-          PROJECT_DIR=$(dirname "$csproj")
+          PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
-          if [[ "$PROJECT_NAME" == *"Api"* ]] || [[ "$PROJECT_NAME" == *"Blazor"* ]] || [[ "$PROJECT_DIR" == *"/Api/"* ]] || [[ "$PROJECT_DIR" == *"/Blazor/"* ]]; then
+        
-            DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false")
+          if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then
-            if [ "$DEPLOY_TO_CENTRAL" != "true" ]; then
+            PROJECT_DIR=$(dirname "$csproj")
-              echo "Pomijam $PROJECT_NAME (DeployToCentral ≠ true)"
+            echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)"
-              continue
+            echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt
-            fi
-            echo "→ Publish $PROJECT_NAME ($csproj)"
-            dotnet publish "$csproj" --no-restore -c Release -o "./publish-$PROJECT_NAME"
-            # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←
-            # Tu wstaw swój kod deployu (rsync/ssh itp.)
-            # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←
           else
-            echo "Pomijam $PROJECT_NAME (nie jest to Api ani Blazor)"
+            echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)"
           fi
         done
-        echo "Pipeline zakończony pomyślnie!"
+        
+        echo ""
+        if [ -s projects-to-build.txt ]; then
+          echo "Znalezione projekty:"
+          cat projects-to-build.txt
+          echo "Łącznie: $(wc -l < projects-to-build.txt)"
+        else
+          echo "BRAK PROJEKTÓW DO BUDOWY!"
+        fi
     depends_on: [publish-datamodels-to-baget]
+  
+  containerize-apps:
+    image: docker:27-cli
+    environment:
+      GITEA_USER:
+        from_secret: gitea_registry_user
+      GITEA_TOKEN:
+        from_secret: gitea_registry_token
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        
+        REGISTRY_ORG="fa"
+        
+        echo "=== DEBUG: Zawartość projects-to-build.txt ==="
+        cat projects-to-build.txt || echo "Plik nie istnieje!"
+        echo "=== DEBUG: REGISTRY_ORG = '$REGISTRY_ORG' ==="
+        
+        echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
+        
+        if [ ! -s projects-to-build.txt ]; then
+          echo "Brak projektow"
+          exit 0
+        fi
+        
+        rm -f NuGet.Config
+        
+        cat > NuGet.Config <<EOF
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+            <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+            <add key="BaGet" value="http://127.0.0.1:8080/v3/index.json" />
+          </packageSources>
+        </configuration>
+        EOF
+        
+        cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do
+          PDIR=$(echo "$PDIR" | xargs)
+          PNAME=$(echo "$PNAME" | xargs)
+        
+          echo "=== DEBUG: PDIR='$PDIR' PNAME='$PNAME' ==="
+        
+          test -z "$PNAME" && continue
+          test ! -d "$PDIR" && continue
+        
+          echo -n "git.modwad.pl/fa/" > /tmp/tag.txt
+          echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt
+        
+          echo "=== DEBUG: Generated tag: $(cat /tmp/tag.txt) ==="
+        
+          echo "$PNAME" > /tmp/pname.txt
+          echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt
+        
+          cat > "Dockerfile.temp" <<'ENDOFDOCKERFILE'
+        FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+        WORKDIR /app
+        EXPOSE 8080
+        FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+        WORKDIR /src
+        COPY . .
+        RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj"
+        RUN dotnet publish "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
+        FROM base AS final
+        WORKDIR /app
+        COPY --from=build /app/publish .
+        ENV ASPNETCORE_URLS=http://+:8080
+        ENTRYPOINT ["dotnet", "%%PROJECTNAME%%.dll"]
+        ENDOFDOCKERFILE
+        
+          REAL_PNAME=$(cat /tmp/pname.txt)
+          REAL_PDIR=$(cat /tmp/pdir.txt)
+          sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final"
+        
+          echo "=== Budowanie obrazu ==="
+          DOCKER_BUILDKIT=0 docker build \
+            --network=host \
+            -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \
+            -t "$(cat /tmp/tag.txt):latest" \
+            -f "Dockerfile.final" \
+            .
+        
+          echo "=== Pushing SHA tag ==="
+          docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}"
+        
+          echo "=== Pushing latest tag ==="
+          docker push "$(cat /tmp/tag.txt):latest"
+        
+          echo "=== SUCCESS: $(cat /tmp/tag.txt) ==="
+        
+          rm -f "Dockerfile.temp" "Dockerfile.final"
+        done
+        
+        echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ==="
+    depends_on: [select-projects-for-container]
+  
+  deploy-linux-local:
+    image: alpine:latest
+    commands:
+      - |
+        cd "${CI_WORKSPACE}"
+        
+        echo "=== Sprawdzanie aplikacji LinuxLocal ==="
+        if [ ! -d "./linux-apps" ]; then
+          echo "Folder ./linux-apps nie istnieje"
+          exit 0
+        fi
+        
+        echo "=== DEBUG: Zawartość ./linux-apps/ ==="
+        ls -la ./linux-apps/
+        
+        echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ==="
+        mkdir -p /opt/fa-apps
+        
+        cd ./linux-apps
+        
+        for app in *; do
+          echo "→ DEBUG: Sprawdzam $app"
+          
+          if [ ! -d "$app" ]; then
+            echo "  → $app nie jest folderem, pomijam"
+            continue
+          fi
+          
+          echo "  → Kopiuję $app"
+          echo "  → Zawartość:"
+          ls -la "$app/"
+          
+          rm -rf "/opt/fa-apps/$app"
+          cp -r "$app" "/opt/fa-apps/$app"
+          
+          find "/opt/fa-apps/$app" -type f -executable -exec chmod +x {} \;
+          
+          echo "  → Skopiowano!"
+        done
+        
+        cd "${CI_WORKSPACE}"
+        
+        echo ""
+        echo "=== Wdrożone aplikacje ==="
+        ls -laR /opt/fa-apps/
+    depends_on: [publish-linux-local, containerize-apps]
+  
+  cleanup-docker:
+    image: docker:27-cli
+    commands:
+      - |
+        echo "=== Status przed czyszczeniem ==="
+        docker system df
+        
+        echo ""
+        echo "=== Usuwanie dangling images ==="
+        docker image prune -f
+        
+        echo ""
+        echo "=== Usuwanie starych wersji aplikacji ==="
+        docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do
+          echo "Usuwam: $img"
+          docker rmi "$img" || true
+        done
+        
+        echo ""
+        echo "=== Usuwanie kontenerów ==="
+        docker container prune -f
+        
+        echo ""
+        echo "=== Usuwanie build cache ==="
+        docker builder prune -af
+        
+        echo ""
+        echo "=== Status po czyszczeniu ==="
+        docker system df
+    depends_on: [deploy-linux-local]
+    when:
+      status: [success, failure]

FaKrosnoApi/FaKrosnoApi.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
-    <PackageReference Include="FaKrosnoEfDataModel" Version="2.0.0" />
+    <PackageReference Include="FaKrosnoEfDataModel" Version="2.0.1-alpha.0.65" />
     <PackageReference Include="Hangfire" Version="1.8.17" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
@@ -20,13 +20,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
     <PackageReference Include="NSwag.AspNetCore" Version="14.2.0" />
+    <PackageReference Include="OrdersManagementDataModel" Version="2.0.0-alpha.0" />
     <PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="29.2.4" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
-    <PackageReference Include="SytelineSaAppEfDataModel" Version="1.1.2" />
+    <PackageReference Include="SytelineSaAppEfDataModel" Version="2.0.1-alpha.0.65" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\OrdersManagementDataModel\OrdersManagementDataModel.csproj" />
   </ItemGroup>
 
 </Project>

FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj

@@ -10,6 +10,7 @@
     <Nullable>enable</Nullable>
     <MinVerAutoIncrement>patch</MinVerAutoIncrement>
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>

OrdersManagement/OrdersManagement.csproj

@@ -10,9 +10,11 @@
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
+    <PackageReference Include="FaKrosnoEfDataModel" Version="2.0.1-alpha.0.65" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.6.1" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.1" />
+    <PackageReference Include="OrdersManagementDataModel" Version="2.0.0-alpha.0" />
     <PackageReference Include="Syncfusion.Blazor.Buttons" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Cards" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Core" Version="28.2.3" />
@@ -21,11 +23,7 @@
     <PackageReference Include="Syncfusion.Blazor.SplitButtons" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Themes" Version="28.2.3" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.1" />
-    <PackageReference Include="SytelineSaAppEfDataModel" Version="2.0.1-alpha.0.1" />
+    <PackageReference Include="SytelineSaAppEfDataModel" Version="2.0.1-alpha.0.65" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\OrdersManagementDataModel\OrdersManagementDataModel.csproj" />
   </ItemGroup>
 
   <ItemGroup>

OrdersManagementDataModel/OrdersManagementDataModel.csproj

@@ -5,6 +5,13 @@
         <ProjectType>DataModel</ProjectType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+
+        <PackageId>OrdersManagementDataModel</PackageId>
+        <Authors>Piotr Kus</Authors>
+        <Description>OrdersManagement Entity Framework Data Model</Description>
+        <MinVerAutoIncrement>patch</MinVerAutoIncrement>
+        <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj

@@ -12,6 +12,7 @@
     <Description>Syteline Entity Framework Data Model</Description>
     <MinVerAutoIncrement>patch</MinVerAutoIncrement>
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
   
   <ItemGroup>