From 6d1f87f9d9db351b836d230148f1fcf6d976b012 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:43:48 +0000 Subject: [PATCH 01/58] Update .woodpecker.yml --- .woodpecker.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 43dde5f..065929e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,11 +108,17 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - containerize-apps: + prepare-for-container: image: mcr.microsoft.com/dotnet/sdk:latest - privileged: true - volumes: - - /var/run/docker.sock:/var/run/docker.sock + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + dotnet restore + echo "Restore i przygotowanie do konteneryzacji wykonane" + depends_on: [publish-datamodels-to-baget] + containerize-apps: + image: woodpeckerci/plugin-docker-buildx:latest environment: GITEA_USER: from_secret: gitea_registry_user @@ -122,17 +128,9 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - - # Instalacja narzędzi Docker w kontenerze .NET (Alpine-based) - apk update && apk add --no-cache docker docker-cli-buildx - echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - - dotnet restore - find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) @@ -170,4 +168,4 @@ steps: rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [publish-datamodels-to-baget] \ No newline at end of file + depends_on: [prepare-for-container] \ No newline at end of file -- 2.49.1 From b04546260a6ec916a3aaedc99a8af6fc1c2b116f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:48:41 +0000 Subject: [PATCH 02/58] Update .woodpecker.yml --- .woodpecker.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 065929e..d08c34a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,15 +108,6 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - prepare-for-container: - image: mcr.microsoft.com/dotnet/sdk:latest - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - dotnet restore - echo "Restore i przygotowanie do konteneryzacji wykonane" - depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: @@ -131,6 +122,7 @@ steps: echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin + dotnet restore find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) @@ -168,4 +160,4 @@ steps: rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [prepare-for-container] \ No newline at end of file + depends_on: [publish-datamodels-to-baget] \ No newline at end of file -- 2.49.1 From 4863d9120b094acc69c09725d98e27d16ce44258 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:52:08 +0000 Subject: [PATCH 03/58] Update .woodpecker.yml --- .woodpecker.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d08c34a..e06c5ec 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -109,7 +109,7 @@ steps: done depends_on: [pack-datamodels] containerize-apps: - image: woodpeckerci/plugin-docker-buildx:latest + image: mcr.microsoft.com/dotnet/sdk:latest environment: GITEA_USER: from_secret: gitea_registry_user @@ -119,10 +119,17 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + + # Instalacja narzędzi Docker w obrazie .NET (Alpine) + apk update && apk add --no-cache docker docker-cli-buildx + echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin + dotnet restore + find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) -- 2.49.1 From 27dbb780ec7f977640a31a5306a0c1df1f9ccec6 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:54:22 +0000 Subject: [PATCH 04/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index e06c5ec..379332c 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -121,7 +121,7 @@ steps: cd "${CI_WORKSPACE}" # Instalacja narzędzi Docker w obrazie .NET (Alpine) - apk update && apk add --no-cache docker docker-cli-buildx + apt-get update && apt-get add --no-cache docker docker-cli-buildx echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." -- 2.49.1 From 7a8d3cf10c9dd9a6b310d2b16a385915c1a5b7ca Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:58:05 +0000 Subject: [PATCH 05/58] Update .woodpecker.yml --- .woodpecker.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 379332c..2035918 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,8 +108,17 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - containerize-apps: + prepare-for-container: image: mcr.microsoft.com/dotnet/sdk:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + dotnet restore + echo "Przygotowanie do konteneryzacji wykonane (restore zrobione)" + depends_on: [publish-datamodels-to-baget] + containerize-apps: + image: woodpeckerci/plugin-docker-buildx:latest environment: GITEA_USER: from_secret: gitea_registry_user @@ -119,17 +128,10 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - - # Instalacja narzędzi Docker w obrazie .NET (Alpine) - apt-get update && apt-get add --no-cache docker docker-cli-buildx - echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - dotnet restore - find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) @@ -167,4 +169,4 @@ steps: rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [publish-datamodels-to-baget] \ No newline at end of file + depends_on: [prepare-for-container] \ No newline at end of file -- 2.49.1 From 9aaeaa054879213399423cc8e1906061ab8cca6c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:01:28 +0000 Subject: [PATCH 06/58] Update .woodpecker.yml --- .woodpecker.yml | 59 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 2035918..75fdbd0 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,9 +1,11 @@ skip_clone: true + when: event: pull_request action: - merge branch: master + steps: debug-location: image: alpine @@ -11,12 +13,14 @@ steps: - pwd - 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 branch: master depth: 1 + restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -26,6 +30,7 @@ steps: echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; + test: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -35,6 +40,7 @@ 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: @@ -78,6 +84,7 @@ steps: echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] + publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -108,6 +115,7 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] + prepare-for-container: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -117,6 +125,7 @@ steps: dotnet restore echo "Przygotowanie do konteneryzacji wykonane (restore zrobione)" depends_on: [publish-datamodels-to-baget] + containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: @@ -128,45 +137,59 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + echo "DEBUG: Użytkownik = '$GITEA_USER'" - echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." + echo "DEBUG: Token (pierwsze 4 znaki) = ${GITEA_TOKEN:0:4}..." + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) - PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then + + # bezpieczniejsze pobieranie właściwości (bez errorów w logach) + PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -nologo 2>/dev/null || echo "Unknown") + DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -nologo 2>/dev/null || echo "false") + + if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [ "$PROJECT_TYPE" = "Unknown" ] || [ "$PROJECT_TYPE" = "DataModel" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" continue fi + IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + + cat > "${PROJECT_DIR}/Dockerfile.temp" <<-'EOF' + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF + echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" + docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -f "${PROJECT_DIR}/Dockerfile.temp" \ "${PROJECT_DIR}" + docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" docker push "${FULL_IMAGE}:latest" + rm -f "${PROJECT_DIR}/Dockerfile.temp" + echo "Opublikowano: ${FULL_IMAGE}:latest" done depends_on: [prepare-for-container] \ No newline at end of file -- 2.49.1 From 7c2001ad342bc3b0807979a5afa55341945de147 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:04:34 +0000 Subject: [PATCH 07/58] Update .woodpecker.yml --- .woodpecker.yml | 72 ++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 75fdbd0..d08c34a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,11 +1,9 @@ skip_clone: true - when: event: pull_request action: - merge branch: master - steps: debug-location: image: alpine @@ -13,14 +11,12 @@ steps: - pwd - 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 branch: master depth: 1 - restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -30,7 +26,6 @@ steps: echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; - test: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -40,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: @@ -84,7 +78,6 @@ steps: echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] - publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -115,17 +108,6 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - - prepare-for-container: - image: mcr.microsoft.com/dotnet/sdk:latest - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - dotnet restore - echo "Przygotowanie do konteneryzacji wykonane (restore zrobione)" - depends_on: [publish-datamodels-to-baget] - containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: @@ -137,59 +119,45 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - echo "DEBUG: Użytkownik = '$GITEA_USER'" - echo "DEBUG: Token (pierwsze 4 znaki) = ${GITEA_TOKEN:0:4}..." - + echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - + dotnet restore find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) - - # bezpieczniejsze pobieranie właściwości (bez errorów w logach) - PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -nologo 2>/dev/null || echo "Unknown") - DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -nologo 2>/dev/null || echo "false") - - if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [ "$PROJECT_TYPE" = "Unknown" ] || [ "$PROJECT_TYPE" = "DataModel" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then + PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") + if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" continue fi - IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - - cat > "${PROJECT_DIR}/Dockerfile.temp" <<-'EOF' - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF - echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" - docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -f "${PROJECT_DIR}/Dockerfile.temp" \ "${PROJECT_DIR}" - docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" docker push "${FULL_IMAGE}:latest" - rm -f "${PROJECT_DIR}/Dockerfile.temp" - echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [prepare-for-container] \ No newline at end of file + depends_on: [publish-datamodels-to-baget] \ No newline at end of file -- 2.49.1 From 81af6f02d93ea4502c2d60c1872a07f36b39847a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:08:45 +0000 Subject: [PATCH 08/58] Update .woodpecker.yml --- .woodpecker.yml | 85 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d08c34a..b3ee2af 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,12 +11,14 @@ steps: - pwd - 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 branch: master depth: 1 + restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -26,6 +28,7 @@ steps: echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; + test: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -35,6 +38,7 @@ 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: @@ -78,6 +82,7 @@ steps: echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] + publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -108,6 +113,18 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] + + prepare-restore-for-docker: + image: mcr.microsoft.com/dotnet/sdk:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + echo "=== Przygotowanie do budowania obrazów ===" + dotnet restore + echo "Restore dla projektów zakończone" + depends_on: [publish-datamodels-to-baget] + containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: @@ -118,46 +135,64 @@ steps: commands: - | set -euf + cd "${CI_WORKSPACE}" + echo "DEBUG: Użytkownik = '$GITEA_USER'" - echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - dotnet restore + echo "DEBUG: Token (pierwsze 4 znaki) = ${GITEA_TOKEN:0:4}..." + + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin || { + echo "Błąd logowania do rejestru" + exit 1 + } + find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) - PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" - continue - fi + + # Tymczasowo pomijamy projekty, które nie mają iść do centralnego rejestru + # Jeśli masz dokładne kryterium → możesz dodać grep po true + # Na razie prosty filtr po nazwie (dostosuj do swoich konwencji) + case "$PROJECT_NAME" in + *DataModel*|*LinuxLocal*) + echo "Pomijam $PROJECT_NAME (DataModel / LinuxLocal)" + continue ;; + esac + IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" + + echo "Przygotowuję Dockerfile dla ${PROJECT_NAME}" + cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF + echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" + docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -f "${PROJECT_DIR}/Dockerfile.temp" \ + --push \ "${PROJECT_DIR}" - docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" - docker push "${FULL_IMAGE}:latest" + rm -f "${PROJECT_DIR}/Dockerfile.temp" + echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [publish-datamodels-to-baget] \ No newline at end of file + depends_on: [prepare-restore-for-docker] \ No newline at end of file -- 2.49.1 From 531260eb9c5628c1f9e17ba724db0f1bd76b0cd5 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:14:11 +0000 Subject: [PATCH 09/58] Update .woodpecker.yml --- .woodpecker.yml | 98 +++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 57 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b3ee2af..a1ef11a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,14 +11,12 @@ steps: - pwd - 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 branch: master depth: 1 - restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -28,7 +26,6 @@ steps: echo "Aktualna ścieżka: $(pwd)" echo "=== Restore wszystkich projektów ===" find . -name "*.csproj" -type f -exec dotnet restore "{}" \; - test: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -38,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: @@ -82,7 +78,6 @@ steps: echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] - publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -113,20 +108,31 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - - prepare-restore-for-docker: + select-projects-for-docker: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - echo "=== Przygotowanie do budowania obrazów ===" - dotnet restore - echo "Restore dla projektów zakończone" + echo "" > projects-to-build.txt + find . -name "*.csproj" -type f | while read csproj; do + PROJECT_DIR=$(dirname "$csproj") + PROJECT_NAME=$(basename "$csproj" .csproj) + PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") + if [ "$DEPLOY_TO_CENTRAL" = "true" ] && [ "$PROJECT_TYPE" != "Unknown" ] && [ "$PROJECT_TYPE" != "DataModel" ] && [ "$PROJECT_TYPE" != "LinuxLocal" ]; then + echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt + echo "Wybrano do builda: $PROJECT_NAME ($PROJECT_TYPE, DeployToCentral=true)" + else + echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE, DeployToCentral=$DEPLOY_TO_CENTRAL)" + fi + done + echo "=== Lista wybranych projektów ===" + cat projects-to-build.txt || echo "Brak projektów do builda" depends_on: [publish-datamodels-to-baget] - containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest + privileged: true environment: GITEA_USER: from_secret: gitea_registry_user @@ -135,64 +141,42 @@ steps: commands: - | set -euf - cd "${CI_WORKSPACE}" - echo "DEBUG: Użytkownik = '$GITEA_USER'" - echo "DEBUG: Token (pierwsze 4 znaki) = ${GITEA_TOKEN:0:4}..." - - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin || { - echo "Błąd logowania do rejestru" - exit 1 - } - - find . -name "*.csproj" -type f | while read csproj; do - PROJECT_DIR=$(dirname "$csproj") - PROJECT_NAME=$(basename "$csproj" .csproj) - - # Tymczasowo pomijamy projekty, które nie mają iść do centralnego rejestru - # Jeśli masz dokładne kryterium → możesz dodać grep po true - # Na razie prosty filtr po nazwie (dostosuj do swoich konwencji) - case "$PROJECT_NAME" in - *DataModel*|*LinuxLocal*) - echo "Pomijam $PROJECT_NAME (DataModel / LinuxLocal)" - continue ;; - esac - + echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin + if [ ! -f projects-to-build.txt ]; then + echo "Brak pliku projects-to-build.txt – nic nie budujemy" + exit 0 + fi + cat projects-to-build.txt | while IFS='|' read PROJECT_DIR PROJECT_NAME; do + if [ -z "$PROJECT_NAME" ]; then continue; fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - - echo "Przygotowuję Dockerfile dla ${PROJECT_NAME}" - cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF - echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" - docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -f "${PROJECT_DIR}/Dockerfile.temp" \ - --push \ "${PROJECT_DIR}" - + docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" + docker push "${FULL_IMAGE}:latest" rm -f "${PROJECT_DIR}/Dockerfile.temp" - echo "Opublikowano: ${FULL_IMAGE}:latest" done - depends_on: [prepare-restore-for-docker] \ No newline at end of file + depends_on: [select-projects-for-docker] \ No newline at end of file -- 2.49.1 From c064479a2fd492bca4de735a5d01f4f6f59872af Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:14:41 +0000 Subject: [PATCH 10/58] Update .woodpecker.yml --- .woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a1ef11a..b48852d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -132,7 +132,6 @@ steps: depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest - privileged: true environment: GITEA_USER: from_secret: gitea_registry_user -- 2.49.1 From fa8c0f3eb2893f447d5652d0c93146181056bcb4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:17:53 +0000 Subject: [PATCH 11/58] Update .woodpecker.yml --- .woodpecker.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b48852d..5a878ff 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,27 +108,24 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - select-projects-for-docker: + select-projects-for-container: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - echo "" > projects-to-build.txt + > projects-to-build.txt find . -name "*.csproj" -type f | while read csproj; do - PROJECT_DIR=$(dirname "$csproj") - PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ "$DEPLOY_TO_CENTRAL" = "true" ] && [ "$PROJECT_TYPE" != "Unknown" ] && [ "$PROJECT_TYPE" != "DataModel" ] && [ "$PROJECT_TYPE" != "LinuxLocal" ]; then - echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt - echo "Wybrano do builda: $PROJECT_NAME ($PROJECT_TYPE, DeployToCentral=true)" + if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then + : else - echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE, DeployToCentral=$DEPLOY_TO_CENTRAL)" + PROJECT_NAME=$(basename "$csproj" .csproj) + PROJECT_DIR=$(dirname "$csproj") + echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt fi done - echo "=== Lista wybranych projektów ===" - cat projects-to-build.txt || echo "Brak projektów do builda" depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest @@ -144,11 +141,11 @@ steps: echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - if [ ! -f projects-to-build.txt ]; then - echo "Brak pliku projects-to-build.txt – nic nie budujemy" + if [ ! -s projects-to-build.txt ]; then + echo "Brak projektów do zbudowania" exit 0 fi - cat projects-to-build.txt | while IFS='|' read PROJECT_DIR PROJECT_NAME; do + while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do if [ -z "$PROJECT_NAME" ]; then continue; fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" @@ -177,5 +174,5 @@ steps: docker push "${FULL_IMAGE}:latest" rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" - done - depends_on: [select-projects-for-docker] \ No newline at end of file + done < projects-to-build.txt + depends_on: [select-projects-for-container] \ No newline at end of file -- 2.49.1 From 216a966f395b327e8147f8f992d4a006ef42d7f2 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:20:55 +0000 Subject: [PATCH 12/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5a878ff..25f04b5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -118,7 +118,7 @@ steps: find . -name "*.csproj" -type f | while read csproj; do PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then + if [ [ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]; then : else PROJECT_NAME=$(basename "$csproj" .csproj) -- 2.49.1 From e391d060851dc49c9b35e607076307855989219c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:27:16 +0000 Subject: [PATCH 13/58] Update .woodpecker.yml --- .woodpecker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 25f04b5..3b51b6a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -117,8 +117,7 @@ steps: > projects-to-build.txt find . -name "*.csproj" -type f | while read csproj; do PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ [ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]; then + if [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then : else PROJECT_NAME=$(basename "$csproj" .csproj) -- 2.49.1 From 606bd31e21ba53959ad5db5717118c7f968ab0d1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:36:34 +0000 Subject: [PATCH 14/58] Update .woodpecker.yml --- .woodpecker.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3b51b6a..990bc52 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -148,21 +148,21 @@ steps: if [ -z "$PROJECT_NAME" ]; then continue; fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] - EOF + cat > "${PROJECT_DIR}/Dockerfile.temp" <<'EOF' +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 "${PROJECT_NAME}.csproj" +RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false +FROM base AS final +WORKDIR /app +COPY --from=build /app/publish . +ENV ASPNETCORE_URLS=http://+:8080 +ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] +EOF echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -- 2.49.1 From 76b069a51e301658bb44995e8e0ee4ef2ae989ab Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:44:14 +0000 Subject: [PATCH 15/58] Update .woodpecker.yml --- .woodpecker.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 990bc52..7c95489 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -148,21 +148,21 @@ steps: if [ -z "$PROJECT_NAME" ]; then continue; fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - cat > "${PROJECT_DIR}/Dockerfile.temp" <<'EOF' -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 "${PROJECT_NAME}.csproj" -RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false -FROM base AS final -WORKDIR /app -COPY --from=build /app/publish . -ENV ASPNETCORE_URLS=http://+:8080 -ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] -EOF + cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + EOF echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -- 2.49.1 From a0451c42de17e0683ba7c91faf6c3e27843baae4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 09:53:19 +0000 Subject: [PATCH 16/58] Update .woodpecker.yml --- .woodpecker.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7c95489..ff6414f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -129,6 +129,7 @@ steps: containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: + DOCKER_HOST: unix:///var/run/docker.sock GITEA_USER: from_secret: gitea_registry_user GITEA_TOKEN: @@ -137,6 +138,9 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + echo "DEBUG: DOCKER_HOST = $DOCKER_HOST" + echo "DEBUG: ls /var/run/docker.sock:" + ls -l /var/run/docker.sock || echo "Socket NIE widoczny" echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin -- 2.49.1 From cf878470a566d83d2550dccf894a15639ed55ffd Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 09:57:25 +0000 Subject: [PATCH 17/58] Update .woodpecker.yml --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index ff6414f..e4e1ea7 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -128,6 +128,8 @@ steps: depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest + volumes: + - /var/run/docker.sock:/var/run/docker.sock environment: DOCKER_HOST: unix:///var/run/docker.sock GITEA_USER: -- 2.49.1 From 86ff97b31113dee03b1c2cd8f958a5634b340732 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:00:20 +0000 Subject: [PATCH 18/58] Update .woodpecker.yml --- .woodpecker.yml | 83 ++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 45 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index e4e1ea7..305d450 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,30 +108,9 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] - select-projects-for-container: - image: mcr.microsoft.com/dotnet/sdk:latest - commands: - - | - set -euf - cd "${CI_WORKSPACE}" - > projects-to-build.txt - 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" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - : - else - PROJECT_NAME=$(basename "$csproj" .csproj) - PROJECT_DIR=$(dirname "$csproj") - echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt - fi - done - depends_on: [publish-datamodels-to-baget] containerize-apps: - image: woodpeckerci/plugin-docker-buildx:latest - volumes: - - /var/run/docker.sock:/var/run/docker.sock + image: mcr.microsoft.com/dotnet/sdk:latest environment: - DOCKER_HOST: unix:///var/run/docker.sock GITEA_USER: from_secret: gitea_registry_user GITEA_TOKEN: @@ -140,35 +119,49 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - echo "DEBUG: DOCKER_HOST = $DOCKER_HOST" + + # Instalacja Dockera CLI i buildx w obrazie Debian-based (.NET SDK) + apt-get update -y && apt-get install -y --no-install-recommends \ + ca-certificates curl gnupg lsb-release \ + && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list \ + && apt-get update -y && apt-get install -y docker-ce-cli docker-buildx-plugin \ + && apt-get clean && rm -rf /var/lib/apt/lists/* + echo "DEBUG: ls /var/run/docker.sock:" ls -l /var/run/docker.sock || echo "Socket NIE widoczny" + echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - if [ ! -s projects-to-build.txt ]; then - echo "Brak projektów do zbudowania" - exit 0 - fi - while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do - if [ -z "$PROJECT_NAME" ]; then continue; fi + + find . -name "*.csproj" -type f | while read csproj; do + PROJECT_DIR=$(dirname "$csproj") + PROJECT_NAME=$(basename "$csproj" .csproj) + PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") + if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then + echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" + continue + fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] - EOF + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + EOF echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ @@ -179,5 +172,5 @@ steps: docker push "${FULL_IMAGE}:latest" rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" - done < projects-to-build.txt - depends_on: [select-projects-for-container] \ No newline at end of file + done + depends_on: [publish-datamodels-to-baget] \ No newline at end of file -- 2.49.1 From 29ef6383b1aba2decf90c8bdc327a40dd132e22c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:02:58 +0000 Subject: [PATCH 19/58] Update .woodpecker.yml --- .woodpecker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 305d450..6421182 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -122,9 +122,11 @@ steps: # Instalacja Dockera CLI i buildx w obrazie Debian-based (.NET SDK) apt-get update -y && apt-get install -y --no-install-recommends \ - ca-certificates curl gnupg lsb-release \ - && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list \ + ca-certificates curl gnupg \ + && install -m 0755 -d /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \ + && chmod a+r /etc/apt/keyrings/docker.asc \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && apt-get update -y && apt-get install -y docker-ce-cli docker-buildx-plugin \ && apt-get clean && rm -rf /var/lib/apt/lists/* -- 2.49.1 From dfc405f4b0f40b3f433256b75fffa97d93ec4fa0 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:05:44 +0000 Subject: [PATCH 20/58] Update .woodpecker.yml --- .woodpecker.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 6421182..4cbe6c1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -109,7 +109,7 @@ steps: done depends_on: [pack-datamodels] containerize-apps: - image: mcr.microsoft.com/dotnet/sdk:latest + image: woodpeckerci/plugin-docker-buildx:latest environment: GITEA_USER: from_secret: gitea_registry_user @@ -119,25 +119,9 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - - # Instalacja Dockera CLI i buildx w obrazie Debian-based (.NET SDK) - apt-get update -y && apt-get install -y --no-install-recommends \ - ca-certificates curl gnupg \ - && install -m 0755 -d /etc/apt/keyrings \ - && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \ - && chmod a+r /etc/apt/keyrings/docker.asc \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ - && apt-get update -y && apt-get install -y docker-ce-cli docker-buildx-plugin \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - - echo "DEBUG: ls /var/run/docker.sock:" - ls -l /var/run/docker.sock || echo "Socket NIE widoczny" - echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - find . -name "*.csproj" -type f | while read csproj; do PROJECT_DIR=$(dirname "$csproj") PROJECT_NAME=$(basename "$csproj" .csproj) -- 2.49.1 From 08800a4c10bf9ce3b059f2a92f61d74720091c20 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:08:01 +0000 Subject: [PATCH 21/58] Update .woodpecker.yml --- .woodpecker.yml | 69 +++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4cbe6c1..ff6414f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -108,9 +108,28 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] + select-projects-for-container: + image: mcr.microsoft.com/dotnet/sdk:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + > projects-to-build.txt + 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" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then + : + else + PROJECT_NAME=$(basename "$csproj" .csproj) + PROJECT_DIR=$(dirname "$csproj") + echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt + fi + done + depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: + DOCKER_HOST: unix:///var/run/docker.sock GITEA_USER: from_secret: gitea_registry_user GITEA_TOKEN: @@ -119,35 +138,35 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + echo "DEBUG: DOCKER_HOST = $DOCKER_HOST" + echo "DEBUG: ls /var/run/docker.sock:" + ls -l /var/run/docker.sock || echo "Socket NIE widoczny" echo "DEBUG: Użytkownik = '$GITEA_USER'" echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin - find . -name "*.csproj" -type f | while read csproj; do - PROJECT_DIR=$(dirname "$csproj") - PROJECT_NAME=$(basename "$csproj" .csproj) - PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false") - if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" - continue - fi + if [ ! -s projects-to-build.txt ]; then + echo "Brak projektów do zbudowania" + exit 0 + fi + while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do + if [ -z "$PROJECT_NAME" ]; then continue; fi IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] - EOF + 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 "${PROJECT_NAME}.csproj" + RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] + EOF echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ @@ -158,5 +177,5 @@ steps: docker push "${FULL_IMAGE}:latest" rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" - done - depends_on: [publish-datamodels-to-baget] \ No newline at end of file + done < projects-to-build.txt + depends_on: [select-projects-for-container] \ No newline at end of file -- 2.49.1 From c501a84d538249311a1e10e85302d042accb1863 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:18:49 +0000 Subject: [PATCH 22/58] Update .woodpecker.yml --- .woodpecker.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ff6414f..6fda9de 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -129,7 +129,6 @@ steps: containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest environment: - DOCKER_HOST: unix:///var/run/docker.sock GITEA_USER: from_secret: gitea_registry_user GITEA_TOKEN: @@ -138,6 +137,13 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + echo "DEBUG: env DOCKER_HOST = ${DOCKER_HOST:-}" + echo "DEBUG: docker version:" + docker version || echo "docker version FAIL" + echo "DEBUG: ls /var/run:" + ls -l /var/run || true + echo "DEBUG: ls /var/run/docker.sock:" + ls -l /var/run/docker.sock || echo "brak socketu" echo "DEBUG: DOCKER_HOST = $DOCKER_HOST" echo "DEBUG: ls /var/run/docker.sock:" ls -l /var/run/docker.sock || echo "Socket NIE widoczny" -- 2.49.1 From e9d6dbaa5cd022dfc1a4c5006a620edab848eb6d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:25:34 +0000 Subject: [PATCH 23/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 6fda9de..0cd7e74 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -137,7 +137,7 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - echo "DEBUG: env DOCKER_HOST = ${DOCKER_HOST:-}" + echo "DEBUG: envir DOCKER_HOST = ${DOCKER_HOST:-}" echo "DEBUG: docker version:" docker version || echo "docker version FAIL" echo "DEBUG: ls /var/run:" -- 2.49.1 From 7d8de5c78fde027b773c5b3c2e67dcdfbdebd42b Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:32:39 +0000 Subject: [PATCH 24/58] Update .woodpecker.yml --- .woodpecker.yml | 57 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 0cd7e74..dec625c 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -115,16 +115,27 @@ steps: set -euf cd "${CI_WORKSPACE}" > projects-to-build.txt + + echo "=== DEBUG: Szukam plików .csproj ===" + find . -name "*.csproj" -type f + find . -name "*.csproj" -type f | while read csproj; do + echo "→ Sprawdzam: $csproj" PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + echo " ProjectType = $PROJECT_TYPE" + if [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - : + echo " → Pomijam (typ: $PROJECT_TYPE)" else PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_DIR=$(dirname "$csproj") echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt + echo " → Dodaję: $PROJECT_DIR|$PROJECT_NAME" fi done + + echo "=== DEBUG: Zawartość projects-to-build.txt ===" + cat projects-to-build.txt depends_on: [publish-datamodels-to-baget] containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest @@ -137,27 +148,40 @@ steps: - | set -euf cd "${CI_WORKSPACE}" - echo "DEBUG: envir DOCKER_HOST = ${DOCKER_HOST:-}" - echo "DEBUG: docker version:" - docker version || echo "docker version FAIL" - echo "DEBUG: ls /var/run:" - ls -l /var/run || true - echo "DEBUG: ls /var/run/docker.sock:" - ls -l /var/run/docker.sock || echo "brak socketu" - echo "DEBUG: DOCKER_HOST = $DOCKER_HOST" - echo "DEBUG: ls /var/run/docker.sock:" - ls -l /var/run/docker.sock || echo "Socket NIE widoczny" - echo "DEBUG: Użytkownik = '$GITEA_USER'" - echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..." + + echo "=== DEBUG: Zawartość projects-to-build.txt ===" + cat projects-to-build.txt || echo "Plik nie istnieje!" + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin + if [ ! -s projects-to-build.txt ]; then echo "Brak projektów do zbudowania" exit 0 fi + while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do - if [ -z "$PROJECT_NAME" ]; then continue; fi + # Wyczyść whitespace i pomiń puste linie + PROJECT_DIR=$(echo "$PROJECT_DIR" | xargs) + PROJECT_NAME=$(echo "$PROJECT_NAME" | xargs) + + if [ -z "$PROJECT_NAME" ]; then + echo "OSTRZEŻENIE: Pusta nazwa projektu, pomijam" + continue + fi + + echo "=== DEBUG: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" + IMAGE_NAME="trent/${PROJECT_NAME,,}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" + + echo "=== DEBUG: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" + + # Sprawdź czy PROJECT_DIR istnieje + if [ ! -d "$PROJECT_DIR" ]; then + echo "ERROR: Katalog $PROJECT_DIR nie istnieje!" + continue + fi + cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app @@ -173,15 +197,18 @@ steps: ENV ASPNETCORE_URLS=http://+:8080 ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF + echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -f "${PROJECT_DIR}/Dockerfile.temp" \ "${PROJECT_DIR}" + docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" docker push "${FULL_IMAGE}:latest" + rm -f "${PROJECT_DIR}/Dockerfile.temp" echo "Opublikowano: ${FULL_IMAGE}:latest" done < projects-to-build.txt - depends_on: [select-projects-for-container] \ No newline at end of file + depends_on: [select-projects-for-container] -- 2.49.1 From 492c70f384402f1afdc1723e2a74d356173033d5 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:37:16 +0000 Subject: [PATCH 25/58] Update .woodpecker.yml --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dec625c..fa3247b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -171,7 +171,8 @@ steps: echo "=== DEBUG: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" - IMAGE_NAME="trent/${PROJECT_NAME,,}" + PROJECT_NAME_LOWER=$(echo "$PROJECT_NAME" | tr '[:upper:]' '[:lower:]') + IMAGE_NAME="trent/${PROJECT_NAME_LOWER}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" echo "=== DEBUG: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" -- 2.49.1 From 89de720f931897f7e7047f2167e484d9bc270857 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:40:10 +0000 Subject: [PATCH 26/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fa3247b..c3cca76 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -138,7 +138,7 @@ steps: cat projects-to-build.txt depends_on: [publish-datamodels-to-baget] containerize-apps: - image: woodpeckerci/plugin-docker-buildx:latest + image: docker:27-cli environment: GITEA_USER: from_secret: gitea_registry_user -- 2.49.1 From 353737bae09658b9eabbe85663df4a5373a77964 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:43:37 +0000 Subject: [PATCH 27/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c3cca76..0e7bf9e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -172,7 +172,7 @@ steps: echo "=== DEBUG: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" PROJECT_NAME_LOWER=$(echo "$PROJECT_NAME" | tr '[:upper:]' '[:lower:]') - IMAGE_NAME="trent/${PROJECT_NAME_LOWER}" + IMAGE_NAME="faapp/${PROJECT_NAME_LOWER}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" echo "=== DEBUG: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" -- 2.49.1 From ea6c490edc3b625ab9576a19fe663fc4121705d4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:46:10 +0000 Subject: [PATCH 28/58] Update .woodpecker.yml --- .woodpecker.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 0e7bf9e..b10d682 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -160,22 +160,27 @@ steps: fi while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do + echo "=== DEBUG RAW: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" + # Wyczyść whitespace i pomiń puste linie PROJECT_DIR=$(echo "$PROJECT_DIR" | xargs) PROJECT_NAME=$(echo "$PROJECT_NAME" | xargs) + echo "=== DEBUG AFTER XARGS: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" + if [ -z "$PROJECT_NAME" ]; then echo "OSTRZEŻENIE: Pusta nazwa projektu, pomijam" continue fi - echo "=== DEBUG: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" - + echo "=== DEBUG PRZED TR: PROJECT_NAME='$PROJECT_NAME' ===" PROJECT_NAME_LOWER=$(echo "$PROJECT_NAME" | tr '[:upper:]' '[:lower:]') + echo "=== DEBUG PO TR: PROJECT_NAME_LOWER='$PROJECT_NAME_LOWER' ===" + IMAGE_NAME="faapp/${PROJECT_NAME_LOWER}" FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - echo "=== DEBUG: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" + echo "=== DEBUG FINAL: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" # Sprawdź czy PROJECT_DIR istnieje if [ ! -d "$PROJECT_DIR" ]; then -- 2.49.1 From 8b3d04c6aa15cb543d54e64970d54a3a5be0be7f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:48:53 +0000 Subject: [PATCH 29/58] Update .woodpecker.yml --- .woodpecker.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b10d682..cf6ff8f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -160,29 +160,24 @@ steps: fi while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do - echo "=== DEBUG RAW: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" - - # Wyczyść whitespace i pomiń puste linie PROJECT_DIR=$(echo "$PROJECT_DIR" | xargs) PROJECT_NAME=$(echo "$PROJECT_NAME" | xargs) - echo "=== DEBUG AFTER XARGS: PROJECT_DIR='$PROJECT_DIR' PROJECT_NAME='$PROJECT_NAME' ===" - if [ -z "$PROJECT_NAME" ]; then echo "OSTRZEŻENIE: Pusta nazwa projektu, pomijam" continue fi - echo "=== DEBUG PRZED TR: PROJECT_NAME='$PROJECT_NAME' ===" PROJECT_NAME_LOWER=$(echo "$PROJECT_NAME" | tr '[:upper:]' '[:lower:]') - echo "=== DEBUG PO TR: PROJECT_NAME_LOWER='$PROJECT_NAME_LOWER' ===" - IMAGE_NAME="faapp/${PROJECT_NAME_LOWER}" - FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" + # Buduj string po kawałku, żeby uniknąć cenzurowania + ORG_NAME="faapp" + REGISTRY="git.modwad.pl" + FULL_IMAGE="${REGISTRY}/${ORG_NAME}/${PROJECT_NAME_LOWER}" - echo "=== DEBUG FINAL: IMAGE_NAME='$IMAGE_NAME' FULL_IMAGE='$FULL_IMAGE' ===" + echo "Projekt: ${PROJECT_NAME}" + echo "Obraz: ${FULL_IMAGE}" - # Sprawdź czy PROJECT_DIR istnieje if [ ! -d "$PROJECT_DIR" ]; then echo "ERROR: Katalog $PROJECT_DIR nie istnieje!" continue @@ -204,7 +199,7 @@ steps: ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] EOF - echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}" + echo "Buduję obraz..." docker buildx build --platform linux/amd64 \ -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ -t "${FULL_IMAGE}:latest" \ -- 2.49.1 From 3d59cb1b68b65f871ded569dffc8b71e52d309f1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:51:23 +0000 Subject: [PATCH 30/58] Update .woodpecker.yml --- .woodpecker.yml | 93 ++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 59 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cf6ff8f..8e3ea68 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -116,26 +116,20 @@ steps: cd "${CI_WORKSPACE}" > projects-to-build.txt - echo "=== DEBUG: Szukam plików .csproj ===" - find . -name "*.csproj" -type f - find . -name "*.csproj" -type f | while read csproj; do - echo "→ Sprawdzam: $csproj" PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - echo " ProjectType = $PROJECT_TYPE" if [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - echo " → Pomijam (typ: $PROJECT_TYPE)" + : else PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_DIR=$(dirname "$csproj") echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt - echo " → Dodaję: $PROJECT_DIR|$PROJECT_NAME" fi done - echo "=== DEBUG: Zawartość projects-to-build.txt ===" - cat projects-to-build.txt + echo "Znaleziono projektow do budowy:" + wc -l < projects-to-build.txt depends_on: [publish-datamodels-to-baget] containerize-apps: image: docker:27-cli @@ -149,67 +143,48 @@ steps: set -euf cd "${CI_WORKSPACE}" - echo "=== DEBUG: Zawartość projects-to-build.txt ===" - cat projects-to-build.txt || echo "Plik nie istnieje!" - echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin if [ ! -s projects-to-build.txt ]; then - echo "Brak projektów do zbudowania" + echo "Brak projektow" exit 0 fi - while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do - PROJECT_DIR=$(echo "$PROJECT_DIR" | xargs) - PROJECT_NAME=$(echo "$PROJECT_NAME" | xargs) + cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do + PDIR=$(echo "$PDIR" | xargs) + PNAME=$(echo "$PNAME" | xargs) - if [ -z "$PROJECT_NAME" ]; then - echo "OSTRZEŻENIE: Pusta nazwa projektu, pomijam" - continue - fi + test -z "$PNAME" && continue + test ! -d "$PDIR" && continue - PROJECT_NAME_LOWER=$(echo "$PROJECT_NAME" | tr '[:upper:]' '[:lower:]') + LOWER=$(echo "$PNAME" | tr 'A-Z' 'a-z') + TAG="git.modwad.pl/faapp/${LOWER}" - # Buduj string po kawałku, żeby uniknąć cenzurowania - ORG_NAME="faapp" - REGISTRY="git.modwad.pl" - FULL_IMAGE="${REGISTRY}/${ORG_NAME}/${PROJECT_NAME_LOWER}" + cat > "${PDIR}/Dockerfile.temp" < "${PROJECT_DIR}/Dockerfile.temp" <<-EOF - 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 "${PROJECT_NAME}.csproj" - RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false - FROM base AS final - WORKDIR /app - COPY --from=build /app/publish . - ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"] - EOF - - echo "Buduję obraz..." docker buildx build --platform linux/amd64 \ - -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \ - -t "${FULL_IMAGE}:latest" \ - -f "${PROJECT_DIR}/Dockerfile.temp" \ - "${PROJECT_DIR}" + -t "${TAG}:${CI_COMMIT_SHA}" \ + -t "${TAG}:latest" \ + -f "${PDIR}/Dockerfile.temp" \ + "${PDIR}" 2>&1 | head -20 - docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}" - docker push "${FULL_IMAGE}:latest" + docker push "${TAG}:${CI_COMMIT_SHA}" 2>&1 | head -10 + docker push "${TAG}:latest" 2>&1 | head -10 - rm -f "${PROJECT_DIR}/Dockerfile.temp" - echo "Opublikowano: ${FULL_IMAGE}:latest" - done < projects-to-build.txt + rm -f "${PDIR}/Dockerfile.temp" + done depends_on: [select-projects-for-container] -- 2.49.1 From f3060013d30ce5bd78d72db9a0c259b02993f282 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:52:31 +0000 Subject: [PATCH 31/58] Update .woodpecker.yml --- .woodpecker.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8e3ea68..1bdbf1d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -160,30 +160,32 @@ steps: LOWER=$(echo "$PNAME" | tr 'A-Z' 'a-z') TAG="git.modwad.pl/faapp/${LOWER}" - cat > "${PDIR}/Dockerfile.temp" < "${PDIR}/Dockerfile.temp" <<'DFEND' + 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 "PROJECTNAME.csproj" + RUN dotnet publish "PROJECTNAME.csproj" -c Release -o /app/publish /p:UseAppHost=false + FROM base AS final + WORKDIR /app + COPY --from=build /app/publish . + ENV ASPNETCORE_URLS=http://+:8080 + ENTRYPOINT ["dotnet", "PROJECTNAME.dll"] + DFEND + + sed -i "s/PROJECTNAME/${PNAME}/g" "${PDIR}/Dockerfile.temp" docker buildx build --platform linux/amd64 \ -t "${TAG}:${CI_COMMIT_SHA}" \ -t "${TAG}:latest" \ -f "${PDIR}/Dockerfile.temp" \ - "${PDIR}" 2>&1 | head -20 + "${PDIR}" - docker push "${TAG}:${CI_COMMIT_SHA}" 2>&1 | head -10 - docker push "${TAG}:latest" 2>&1 | head -10 + docker push "${TAG}:${CI_COMMIT_SHA}" + docker push "${TAG}:latest" rm -f "${PDIR}/Dockerfile.temp" done -- 2.49.1 From cfe7924d2511c0fd31828403a3960d829195868d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:54:43 +0000 Subject: [PATCH 32/58] Update .woodpecker.yml --- .woodpecker.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1bdbf1d..c7f8a64 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -157,8 +157,9 @@ steps: test -z "$PNAME" && continue test ! -d "$PDIR" && continue - LOWER=$(echo "$PNAME" | tr 'A-Z' 'a-z') - TAG="git.modwad.pl/faapp/${LOWER}" + echo "$PNAME" | tr 'A-Z' 'a-z' > /tmp/lower.txt + echo "git.modwad.pl/faapp/" > /tmp/tag.txt + cat /tmp/lower.txt >> /tmp/tag.txt cat > "${PDIR}/Dockerfile.temp" <<'DFEND' FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base @@ -179,13 +180,13 @@ steps: sed -i "s/PROJECTNAME/${PNAME}/g" "${PDIR}/Dockerfile.temp" docker buildx build --platform linux/amd64 \ - -t "${TAG}:${CI_COMMIT_SHA}" \ - -t "${TAG}:latest" \ + -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ + -t "$(cat /tmp/tag.txt):latest" \ -f "${PDIR}/Dockerfile.temp" \ "${PDIR}" - docker push "${TAG}:${CI_COMMIT_SHA}" - docker push "${TAG}:latest" + docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" + docker push "$(cat /tmp/tag.txt):latest" rm -f "${PDIR}/Dockerfile.temp" done -- 2.49.1 From 78806115bac35f7d659afff0cdc5c653c6a43b5a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:57:33 +0000 Subject: [PATCH 33/58] Update .woodpecker.yml --- .woodpecker.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c7f8a64..e21ca10 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -157,9 +157,8 @@ steps: test -z "$PNAME" && continue test ! -d "$PDIR" && continue - echo "$PNAME" | tr 'A-Z' 'a-z' > /tmp/lower.txt - echo "git.modwad.pl/faapp/" > /tmp/tag.txt - cat /tmp/lower.txt >> /tmp/tag.txt + echo -n "git.modwad.pl/faapp/" > /tmp/tag.txt + echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt cat > "${PDIR}/Dockerfile.temp" <<'DFEND' FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -- 2.49.1 From 065744d15a2a6a5d61286269e65b06779f31410f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:04:27 +0000 Subject: [PATCH 34/58] Update .woodpecker.yml --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index e21ca10..fd0f388 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -178,7 +178,8 @@ steps: sed -i "s/PROJECTNAME/${PNAME}/g" "${PDIR}/Dockerfile.temp" - docker buildx build --platform linux/amd64 \ + docker buildx build \ + --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "${PDIR}/Dockerfile.temp" \ -- 2.49.1 From 260897dd874b116d55b6a6fc7809e110559ce6dd Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:07:15 +0000 Subject: [PATCH 35/58] Update .woodpecker.yml --- .woodpecker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fd0f388..8e4269f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -178,16 +178,18 @@ steps: sed -i "s/PROJECTNAME/${PNAME}/g" "${PDIR}/Dockerfile.temp" + cd "${PDIR}" docker buildx build \ --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ - -f "${PDIR}/Dockerfile.temp" \ - "${PDIR}" + -f "Dockerfile.temp" \ + . docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" docker push "$(cat /tmp/tag.txt):latest" - rm -f "${PDIR}/Dockerfile.temp" + rm -f "Dockerfile.temp" + cd "${CI_WORKSPACE}" done depends_on: [select-projects-for-container] -- 2.49.1 From b0f78e395fa9673895189ccfef00c172bb98bcb7 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:09:37 +0000 Subject: [PATCH 36/58] Update .woodpecker.yml --- .woodpecker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8e4269f..1654baa 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -160,7 +160,9 @@ steps: echo -n "git.modwad.pl/faapp/" > /tmp/tag.txt echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt - cat > "${PDIR}/Dockerfile.temp" <<'DFEND' + cd "${PDIR}" + + cat > "Dockerfile.temp" <<'DFEND' FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 8080 @@ -176,9 +178,8 @@ steps: ENTRYPOINT ["dotnet", "PROJECTNAME.dll"] DFEND - sed -i "s/PROJECTNAME/${PNAME}/g" "${PDIR}/Dockerfile.temp" + sed -i "s/PROJECTNAME/${PNAME}/g" "Dockerfile.temp" - cd "${PDIR}" docker buildx build \ --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -- 2.49.1 From ed508765eb295a0a8f5979b9fe700b9a4702a6d1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:14:18 +0000 Subject: [PATCH 37/58] Update .woodpecker.yml --- .woodpecker.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1654baa..901da5f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -162,23 +162,21 @@ steps: cd "${PDIR}" - cat > "Dockerfile.temp" <<'DFEND' + cat > "Dockerfile.temp" < Date: Thu, 15 Jan 2026 11:17:06 +0000 Subject: [PATCH 38/58] Update .woodpecker.yml --- .woodpecker.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 901da5f..cfd0b9b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -160,35 +160,40 @@ steps: echo -n "git.modwad.pl/faapp/" > /tmp/tag.txt echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt + echo "$PNAME" > /tmp/pname.txt + cd "${PDIR}" - cat > "Dockerfile.temp" < "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 "${PNAME}.csproj" - RUN dotnet publish "${PNAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false + RUN dotnet restore "%%PROJECTNAME%%.csproj" + RUN dotnet publish "%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=build /app/publish . ENV ASPNETCORE_URLS=http://+:8080 - ENTRYPOINT ["dotnet", "${PNAME}.dll"] + ENTRYPOINT ["dotnet", "%%PROJECTNAME%%.dll"] ENDOFDOCKERFILE + REAL_PNAME=$(cat /tmp/pname.txt) + sed "s/%%PROJECTNAME%%/$REAL_PNAME/g" "Dockerfile.temp" > "Dockerfile.final" + docker buildx build \ --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ - -f "Dockerfile.temp" \ + -f "Dockerfile.final" \ . docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" docker push "$(cat /tmp/tag.txt):latest" - rm -f "Dockerfile.temp" + rm -f "Dockerfile.temp" "Dockerfile.final" cd "${CI_WORKSPACE}" done depends_on: [select-projects-for-container] -- 2.49.1 From 9efa5a132fc5775c8dc3d6ca5bb0cbb18cdfa0a9 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:21:05 +0000 Subject: [PATCH 39/58] Update .woodpecker.yml --- .woodpecker.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cfd0b9b..f63c75f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -161,8 +161,7 @@ steps: echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt echo "$PNAME" > /tmp/pname.txt - - cd "${PDIR}" + echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt cat > "Dockerfile.temp" <<'ENDOFDOCKERFILE' FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base @@ -171,8 +170,8 @@ steps: FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY . . - RUN dotnet restore "%%PROJECTNAME%%.csproj" - RUN dotnet publish "%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false + RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" + RUN dotnet publish "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=build /app/publish . @@ -181,7 +180,8 @@ steps: ENDOFDOCKERFILE REAL_PNAME=$(cat /tmp/pname.txt) - sed "s/%%PROJECTNAME%%/$REAL_PNAME/g" "Dockerfile.temp" > "Dockerfile.final" + REAL_PDIR=$(cat /tmp/pdir.txt) + sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" docker buildx build \ --platform linux/amd64 \ @@ -194,6 +194,5 @@ steps: docker push "$(cat /tmp/tag.txt):latest" rm -f "Dockerfile.temp" "Dockerfile.final" - cd "${CI_WORKSPACE}" done depends_on: [select-projects-for-container] -- 2.49.1 From d5c8e3a683fc46e6054d92f01eac7e2ed3615b18 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:37:06 +0000 Subject: [PATCH 40/58] Update .woodpecker.yml --- .woodpecker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f63c75f..a5ca87f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -170,8 +170,8 @@ steps: 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 + RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" --source https://api.nuget.org/v3/index.json --source http://baget:80/v3/index.json + 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 . @@ -184,6 +184,7 @@ steps: sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" docker buildx build \ + --network=app-network \ --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -- 2.49.1 From d007e360819356a6e5e871637be4c59c69513d70 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:42:51 +0000 Subject: [PATCH 41/58] Update .woodpecker.yml --- .woodpecker.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a5ca87f..d5ecfa1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -150,6 +150,9 @@ steps: exit 0 fi + BAGET_IP=$(getent hosts baget | awk '{print $1}') + echo "BaGet IP: $BAGET_IP" + cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do PDIR=$(echo "$PDIR" | xargs) PNAME=$(echo "$PNAME" | xargs) @@ -170,7 +173,7 @@ steps: FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY . . - RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" --source https://api.nuget.org/v3/index.json --source http://baget:80/v3/index.json + 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 @@ -184,7 +187,7 @@ steps: sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" docker buildx build \ - --network=app-network \ + --add-host=baget:${BAGET_IP} \ --platform linux/amd64 \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -- 2.49.1 From 8f859e0cc7f26884be0583f9547a9cfde27ac7e8 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:46:07 +0000 Subject: [PATCH 42/58] Update .woodpecker.yml --- .woodpecker.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d5ecfa1..082e0a9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -150,9 +150,6 @@ steps: exit 0 fi - BAGET_IP=$(getent hosts baget | awk '{print $1}') - echo "BaGet IP: $BAGET_IP" - cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do PDIR=$(echo "$PDIR" | xargs) PNAME=$(echo "$PNAME" | xargs) @@ -186,9 +183,8 @@ steps: REAL_PDIR=$(cat /tmp/pdir.txt) sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" - docker buildx build \ - --add-host=baget:${BAGET_IP} \ - --platform linux/amd64 \ + docker build \ + --network app-network \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "Dockerfile.final" \ -- 2.49.1 From 6b985d2cf71f0577d280eb4d9992a1fcb74a3822 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:48:23 +0000 Subject: [PATCH 43/58] Update .woodpecker.yml --- .woodpecker.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 082e0a9..413af17 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -131,6 +131,23 @@ steps: echo "Znaleziono projektow do budowy:" wc -l < projects-to-build.txt depends_on: [publish-datamodels-to-baget] + create-nuget-config: + image: alpine + commands: + - | + BAGET_IP=$(getent hosts baget | awk '{print $1}') + cat > NuGet.Config.docker < + + + + + + + + EOF + cat NuGet.Config.docker + depends_on: [select-projects-for-container] containerize-apps: image: docker:27-cli environment: @@ -169,6 +186,7 @@ steps: EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src + COPY NuGet.Config.docker ./NuGet.Config COPY . . RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" RUN dotnet publish "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore @@ -183,8 +201,7 @@ steps: REAL_PDIR=$(cat /tmp/pdir.txt) sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" - docker build \ - --network app-network \ + DOCKER_BUILDKIT=0 docker build \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "Dockerfile.final" \ @@ -195,4 +212,4 @@ steps: rm -f "Dockerfile.temp" "Dockerfile.final" done - depends_on: [select-projects-for-container] + depends_on: [create-nuget-config] -- 2.49.1 From 1051e22ab3660c7c8002803b53b23361451c5a75 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:55:05 +0000 Subject: [PATCH 44/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 413af17..1c0003d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -142,7 +142,7 @@ steps: - + EOF -- 2.49.1 From c15b325950f15425da04cc38d908c52a844e5acc Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:04:46 +0000 Subject: [PATCH 45/58] Update .woodpecker.yml --- .woodpecker.yml | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1c0003d..c31fa5d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -131,23 +131,6 @@ steps: echo "Znaleziono projektow do budowy:" wc -l < projects-to-build.txt depends_on: [publish-datamodels-to-baget] - create-nuget-config: - image: alpine - commands: - - | - BAGET_IP=$(getent hosts baget | awk '{print $1}') - cat > NuGet.Config.docker < - - - - - - - - EOF - cat NuGet.Config.docker - depends_on: [select-projects-for-container] containerize-apps: image: docker:27-cli environment: @@ -167,6 +150,17 @@ steps: exit 0 fi + cat > NuGet.Config.docker < + + + + + + + + EOF + cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do PDIR=$(echo "$PDIR" | xargs) PNAME=$(echo "$PNAME" | xargs) @@ -202,6 +196,7 @@ steps: sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final" DOCKER_BUILDKIT=0 docker build \ + --network=host \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "Dockerfile.final" \ @@ -212,4 +207,4 @@ steps: rm -f "Dockerfile.temp" "Dockerfile.final" done - depends_on: [create-nuget-config] + depends_on: [select-projects-for-container] -- 2.49.1 From f7926c78ad8000ed770a4b13d3f94abe60b971b3 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:11:29 +0000 Subject: [PATCH 46/58] Update .woodpecker.yml --- .woodpecker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c31fa5d..b232525 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -150,7 +150,9 @@ steps: exit 0 fi - cat > NuGet.Config.docker < NuGet.Config < @@ -180,7 +182,6 @@ steps: EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src - COPY NuGet.Config.docker ./NuGet.Config COPY . . RUN dotnet restore "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" RUN dotnet publish "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -- 2.49.1 From 9a6f2040cf45734b3e17a557a8aa33a6da8c2b21 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:17:32 +0000 Subject: [PATCH 47/58] Update .woodpecker.yml --- .woodpecker.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b232525..f7226e6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -196,16 +196,27 @@ steps: 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 "BUILD FAILED"; exit 1; } - docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" - docker push "$(cat /tmp/tag.txt):latest" + echo "=== Obraz zbudowany, sprawdzam ===" + docker images | grep "$(cat /tmp/tag.txt | sed 's|git.modwad.pl/||')" || echo "Obraz nie znaleziony w docker images" + + echo "=== Pushing SHA tag ===" + docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" || { echo "PUSH SHA FAILED"; exit 1; } + + echo "=== Pushing latest tag ===" + docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; } + + echo "=== SUCCESS: $(cat /tmp/tag.txt) ===" rm -f "Dockerfile.temp" "Dockerfile.final" done + + echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] -- 2.49.1 From c5b6b10928f532db7b3d66216fa6ee92b0bceb1a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:37:08 +0000 Subject: [PATCH 48/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f7226e6..f66b510 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -170,7 +170,7 @@ steps: test -z "$PNAME" && continue test ! -d "$PDIR" && continue - echo -n "git.modwad.pl/faapp/" > /tmp/tag.txt + echo -n "git.modwad.pl/fa/" > /tmp/tag.txt echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt echo "$PNAME" > /tmp/pname.txt -- 2.49.1 From 448e9c554dca2d14c8d3fe1b836ded0501c72311 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:55:30 +0000 Subject: [PATCH 49/58] Update .woodpecker.yml --- .woodpecker.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f66b510..9e8913f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -119,16 +119,19 @@ steps: 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" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then - : - else + if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_DIR=$(dirname "$csproj") + echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt + else + PROJECT_NAME=$(basename "$csproj" .csproj) + echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" fi done - echo "Znaleziono projektow do budowy:" + echo "=== Znaleziono projektow do budowy ===" + cat projects-to-build.txt || echo "Brak projektów!" wc -l < projects-to-build.txt depends_on: [publish-datamodels-to-baget] containerize-apps: @@ -220,3 +223,18 @@ steps: echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] + cleanup-docker: + image: docker:27-cli + commands: + - | + echo "=== Czyszczenie starych obrazów ===" + docker image prune -af --filter "until=24h" + echo "=== Czyszczenie nieużywanych kontenerów ===" + docker container prune -f + echo "=== Czyszczenie build cache ===" + docker builder prune -af --filter "until=24h" + echo "=== Status po czyszczeniu ===" + docker system df + depends_on: [containerize-apps] + when: + status: [success, failure] -- 2.49.1 From 59415520feb0543050d24178482d1222ce988fd8 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 14:07:58 +0000 Subject: [PATCH 50/58] Update .woodpecker.yml --- .woodpecker.yml | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9e8913f..0291b68 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -116,23 +116,38 @@ steps: cd "${CI_WORKSPACE}" > projects-to-build.txt + echo "=== Debugowanie wszystkich projektów ===" find . -name "*.csproj" -type f | while read csproj; do + PROJECT_NAME=$(basename "$csproj" .csproj) + echo "" + echo "=== Sprawdzam: $PROJECT_NAME ===" + echo "Plik: $csproj" + + # Sprawdź czy ProjectType jest w pliku + grep -i "ProjectType" "$csproj" || echo "Brak ProjectType w pliku!" + + # Pobierz ProjectType przez MSBuild PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + echo "MSBuild zwrócił: '$PROJECT_TYPE'" if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then - PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_DIR=$(dirname "$csproj") - echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" + echo "✓ DODAJĘ do buildu" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt else - PROJECT_NAME=$(basename "$csproj" .csproj) - echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" + echo "✗ POMIJAM (typ niepasujący)" fi done - echo "=== Znaleziono projektow do budowy ===" - cat projects-to-build.txt || echo "Brak projektów!" - wc -l < projects-to-build.txt + echo "" + echo "=== PODSUMOWANIE ===" + 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 @@ -205,16 +220,13 @@ steps: -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):latest" \ -f "Dockerfile.final" \ - . || { echo "BUILD FAILED"; exit 1; } - - echo "=== Obraz zbudowany, sprawdzam ===" - docker images | grep "$(cat /tmp/tag.txt | sed 's|git.modwad.pl/||')" || echo "Obraz nie znaleziony w docker images" + . echo "=== Pushing SHA tag ===" - docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" || { echo "PUSH SHA FAILED"; exit 1; } + docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" echo "=== Pushing latest tag ===" - docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; } + docker push "$(cat /tmp/tag.txt):latest" echo "=== SUCCESS: $(cat /tmp/tag.txt) ===" @@ -237,4 +249,4 @@ steps: docker system df depends_on: [containerize-apps] when: - status: [success, failure] + status: [success, failure] \ No newline at end of file -- 2.49.1 From f27423c33ffa7b8af495a350310acdef69ccf2f5 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 14:12:08 +0000 Subject: [PATCH 51/58] Update .woodpecker.yml --- .woodpecker.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 0291b68..085a1db 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -123,19 +123,17 @@ steps: echo "=== Sprawdzam: $PROJECT_NAME ===" echo "Plik: $csproj" - # Sprawdź czy ProjectType jest w pliku grep -i "ProjectType" "$csproj" || echo "Brak ProjectType w pliku!" - # Pobierz ProjectType przez MSBuild PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") echo "MSBuild zwrócił: '$PROJECT_TYPE'" - if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then + if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ]; then PROJECT_DIR=$(dirname "$csproj") echo "✓ DODAJĘ do buildu" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt else - echo "✗ POMIJAM (typ niepasujący)" + echo "✗ POMIJAM (typ: $PROJECT_TYPE)" fi done @@ -249,4 +247,4 @@ steps: docker system df depends_on: [containerize-apps] when: - status: [success, failure] \ No newline at end of file + status: [success, failure] -- 2.49.1 From 06829c7455bd8d0fec499244211f680c60909159 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 14:28:38 +0000 Subject: [PATCH 52/58] Update .woodpecker.yml --- .woodpecker.yml | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 085a1db..37dfdde 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -116,29 +116,21 @@ steps: cd "${CI_WORKSPACE}" > projects-to-build.txt - echo "=== Debugowanie wszystkich projektów ===" + echo "=== Selekcja projektów do konteneryzacji ===" find . -name "*.csproj" -type f | while read csproj; do PROJECT_NAME=$(basename "$csproj" .csproj) - echo "" - echo "=== Sprawdzam: $PROJECT_NAME ===" - echo "Plik: $csproj" - - grep -i "ProjectType" "$csproj" || echo "Brak ProjectType w pliku!" - PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - echo "MSBuild zwrócił: '$PROJECT_TYPE'" if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ]; then PROJECT_DIR=$(dirname "$csproj") - echo "✓ DODAJĘ do buildu" + echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt else - echo "✗ POMIJAM (typ: $PROJECT_TYPE)" + echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" fi done echo "" - echo "=== PODSUMOWANIE ===" if [ -s projects-to-build.txt ]; then echo "Znalezione projekty:" cat projects-to-build.txt @@ -237,14 +229,35 @@ steps: image: docker:27-cli commands: - | - echo "=== Czyszczenie starych obrazów ===" - docker image prune -af --filter "until=24h" - echo "=== Czyszczenie nieużywanych kontenerów ===" + echo "=== Status przed czyszczeniem ===" + docker system df + + echo "" + echo "=== Usuwanie dangling images (intermediate layers) ===" + docker image prune -f + + echo "" + echo "=== Usuwanie starych wersji aplikacji (zachowaj :latest i obecny SHA) ===" + docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/fa/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do + echo "Usuwam: $img" + docker rmi "$img" || true + done + + echo "" + echo "=== Usuwanie zatrzymanych kontenerów ===" docker container prune -f - echo "=== Czyszczenie build cache ===" - docker builder prune -af --filter "until=24h" + + echo "" + echo "=== Usuwanie całego build cache ===" + docker builder prune -af + + echo "" echo "=== Status po czyszczeniu ===" docker system df + + echo "" + echo "=== Lista pozostałych obrazów ===" + docker images | head -20 depends_on: [containerize-apps] when: - status: [success, failure] + status: [success, failure] \ No newline at end of file -- 2.49.1 From 858193dff5c7c6f95f89d76c615285408dda4a5b Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 20:45:40 +0000 Subject: [PATCH 53/58] Update .woodpecker.yml --- .woodpecker.yml | 106 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 20 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 37dfdde..af5e18d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,9 +1,4 @@ skip_clone: true -when: - event: pull_request - action: - - merge - branch: master steps: debug-location: image: alpine @@ -14,8 +9,8 @@ steps: clone-manual: image: woodpeckerci/plugin-git settings: - remote: http://gitea:3000/FA/FA_WEB.git - branch: master + remote: http://gitea:3000/${CI_REPO}.git + branch: ${CI_COMMIT_BRANCH} depth: 1 restore: image: mcr.microsoft.com/dotnet/sdk:latest @@ -78,6 +73,42 @@ steps: echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] + + # NOWY KROK: Publish LinuxLocal apps + publish-linux-local: + image: mcr.microsoft.com/dotnet/sdk:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + mkdir -p linux-apps + + 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 \ + --no-restore + 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: @@ -108,6 +139,7 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] + select-projects-for-container: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -121,7 +153,7 @@ steps: PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ]; then + if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then PROJECT_DIR=$(dirname "$csproj") echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt @@ -139,6 +171,7 @@ steps: echo "BRAK PROJEKTÓW DO BUDOWY!" fi depends_on: [publish-datamodels-to-baget] + containerize-apps: image: docker:27-cli environment: @@ -146,11 +179,15 @@ steps: from_secret: gitea_registry_user GITEA_TOKEN: from_secret: gitea_registry_token + CI_REPO_OWNER: + from_secret: ci_repo_owner commands: - | set -euf cd "${CI_WORKSPACE}" + REGISTRY_ORG=$(echo "${CI_REPO_OWNER:-fa}" | tr 'A-Z' 'a-z') + echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin if [ ! -s projects-to-build.txt ]; then @@ -178,7 +215,7 @@ steps: test -z "$PNAME" && continue test ! -d "$PDIR" && continue - echo -n "git.modwad.pl/fa/" > /tmp/tag.txt + echo -n "git.modwad.pl/${REGISTRY_ORG}/" > /tmp/tag.txt echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt echo "$PNAME" > /tmp/pname.txt @@ -225,6 +262,39 @@ steps: echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] + + # NOWY KROK: Deploy LinuxLocal na serwer + deploy-linux-local: + image: alpine:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + + if [ ! -d "./linux-apps" ] || [ ! "$(ls -A ./linux-apps)" ]; then + echo "Brak aplikacji LinuxLocal do wdrożenia" + exit 0 + fi + + echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ===" + mkdir -p /opt/fa-apps + + for app in ./linux-apps/*; do + APP_NAME=$(basename "$app") + echo "→ Kopiuję $APP_NAME" + + rm -rf "/opt/fa-apps/$APP_NAME" + cp -r "$app" "/opt/fa-apps/$APP_NAME" + + # Nadaj uprawnienia wykonywania + chmod +x "/opt/fa-apps/$APP_NAME/$APP_NAME" + done + + echo "" + echo "=== Wdrożone aplikacje ===" + ls -la /opt/fa-apps/ + depends_on: [publish-linux-local, containerize-apps] + cleanup-docker: image: docker:27-cli commands: @@ -233,31 +303,27 @@ steps: docker system df echo "" - echo "=== Usuwanie dangling images (intermediate layers) ===" + echo "=== Usuwanie dangling images ===" docker image prune -f echo "" - echo "=== Usuwanie starych wersji aplikacji (zachowaj :latest i obecny SHA) ===" - docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/fa/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do + 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 zatrzymanych kontenerów ===" + echo "=== Usuwanie kontenerów ===" docker container prune -f echo "" - echo "=== Usuwanie całego build cache ===" + echo "=== Usuwanie build cache ===" docker builder prune -af echo "" echo "=== Status po czyszczeniu ===" docker system df - - echo "" - echo "=== Lista pozostałych obrazów ===" - docker images | head -20 - depends_on: [containerize-apps] + depends_on: [deploy-linux-local] when: - status: [success, failure] \ No newline at end of file + status: [success, failure] -- 2.49.1 From c900ac19d352d1afc42942e5d605950ddabdcf42 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 20:50:16 +0000 Subject: [PATCH 54/58] Update .woodpecker.yml --- .woodpecker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index af5e18d..921b25f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -179,14 +179,12 @@ steps: from_secret: gitea_registry_user GITEA_TOKEN: from_secret: gitea_registry_token - CI_REPO_OWNER: - from_secret: ci_repo_owner commands: - | set -euf cd "${CI_WORKSPACE}" - REGISTRY_ORG=$(echo "${CI_REPO_OWNER:-fa}" | tr 'A-Z' 'a-z') + REGISTRY_ORG="fa" echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin -- 2.49.1 From 76826569222e05bda9f78258f9a9065c3bf0b51d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 20:56:43 +0000 Subject: [PATCH 55/58] Update .woodpecker.yml --- .woodpecker.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 921b25f..94d5f1d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -74,7 +74,6 @@ steps: ls -la nupkg/ || echo "Brak spakowanych pakietów!" depends_on: [test] - # NOWY KROK: Publish LinuxLocal apps publish-linux-local: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -186,6 +185,10 @@ steps: 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 @@ -210,12 +213,16 @@ steps: 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/${REGISTRY_ORG}/" > /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 @@ -261,7 +268,6 @@ steps: echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] - # NOWY KROK: Deploy LinuxLocal na serwer deploy-linux-local: image: alpine:latest commands: @@ -284,7 +290,6 @@ steps: rm -rf "/opt/fa-apps/$APP_NAME" cp -r "$app" "/opt/fa-apps/$APP_NAME" - # Nadaj uprawnienia wykonywania chmod +x "/opt/fa-apps/$APP_NAME/$APP_NAME" done -- 2.49.1 From 0c93d9f755ce18abe35a923206ba361b91076543 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 21:02:14 +0000 Subject: [PATCH 56/58] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 94d5f1d..15d9c89 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -218,7 +218,7 @@ steps: test -z "$PNAME" && continue test ! -d "$PDIR" && continue - echo -n "git.modwad.pl/${REGISTRY_ORG}/" > /tmp/tag.txt + 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) ===" -- 2.49.1 From 5f5ffce5b961c09a7a7179ef60c5fc944d6a1f57 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 21:04:48 +0000 Subject: [PATCH 57/58] Update .woodpecker.yml --- .woodpecker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 15d9c89..4413123 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,4 +1,9 @@ skip_clone: true +when: + event: pull_request + action: + - merge + branch: master steps: debug-location: image: alpine -- 2.49.1 From 0af8e090754d1c64d67984f8b53f82362cb908ac Mon Sep 17 00:00:00 2001 From: trent Date: Sun, 18 Jan 2026 11:22:50 +0000 Subject: [PATCH 58/58] Update .woodpecker.yml --- .woodpecker.yml | 86 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4413123..e7502c9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,7 +23,7 @@ steps: - | 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: @@ -86,21 +86,32 @@ steps: set -euf cd "${CI_WORKSPACE}" mkdir -p linux-apps + + echo "=== Konfiguracja NuGet sources ===" + cat < NuGet.Config + + + + + + + + + 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 \ - --no-restore + --self-contained false fi done @@ -156,7 +167,7 @@ steps: find . -name "*.csproj" -type f | while read csproj; do PROJECT_NAME=$(basename "$csproj" .csproj) PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") - + if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then PROJECT_DIR=$(dirname "$csproj") echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" @@ -217,20 +228,20 @@ steps: 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 @@ -246,11 +257,11 @@ steps: 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 \ @@ -258,15 +269,15 @@ steps: -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 @@ -277,30 +288,47 @@ steps: image: alpine:latest commands: - | - set -euf cd "${CI_WORKSPACE}" - if [ ! -d "./linux-apps" ] || [ ! "$(ls -A ./linux-apps)" ]; then - echo "Brak aplikacji LinuxLocal do wdrożenia" + 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 - for app in ./linux-apps/*; do - APP_NAME=$(basename "$app") - echo "→ Kopiuję $APP_NAME" + cd ./linux-apps + + for app in *; do + echo "→ DEBUG: Sprawdzam $app" - rm -rf "/opt/fa-apps/$APP_NAME" - cp -r "$app" "/opt/fa-apps/$APP_NAME" + if [ ! -d "$app" ]; then + echo " → $app nie jest folderem, pomijam" + continue + fi - chmod +x "/opt/fa-apps/$APP_NAME/$APP_NAME" + 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 -la /opt/fa-apps/ + ls -laR /opt/fa-apps/ depends_on: [publish-linux-local, containerize-apps] cleanup-docker: @@ -334,4 +362,4 @@ steps: docker system df depends_on: [deploy-linux-local] when: - status: [success, failure] + status: [success, failure] \ No newline at end of file -- 2.49.1