From 6d1f87f9d9db351b836d230148f1fcf6d976b012 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:43:48 +0000 Subject: [PATCH 01/52] 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 From b04546260a6ec916a3aaedc99a8af6fc1c2b116f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:48:41 +0000 Subject: [PATCH 02/52] 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 From 4863d9120b094acc69c09725d98e27d16ce44258 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:52:08 +0000 Subject: [PATCH 03/52] 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) From 27dbb780ec7f977640a31a5306a0c1df1f9ccec6 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:54:22 +0000 Subject: [PATCH 04/52] 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..." From 7a8d3cf10c9dd9a6b310d2b16a385915c1a5b7ca Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 07:58:05 +0000 Subject: [PATCH 05/52] 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 From 9aaeaa054879213399423cc8e1906061ab8cca6c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:01:28 +0000 Subject: [PATCH 06/52] 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 From 7c2001ad342bc3b0807979a5afa55341945de147 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:04:34 +0000 Subject: [PATCH 07/52] 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 From 81af6f02d93ea4502c2d60c1872a07f36b39847a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:08:45 +0000 Subject: [PATCH 08/52] 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 From 531260eb9c5628c1f9e17ba724db0f1bd76b0cd5 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:14:11 +0000 Subject: [PATCH 09/52] 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 From c064479a2fd492bca4de735a5d01f4f6f59872af Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:14:41 +0000 Subject: [PATCH 10/52] 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 From fa8c0f3eb2893f447d5652d0c93146181056bcb4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:17:53 +0000 Subject: [PATCH 11/52] 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 From 216a966f395b327e8147f8f992d4a006ef42d7f2 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:20:55 +0000 Subject: [PATCH 12/52] 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) From e391d060851dc49c9b35e607076307855989219c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:27:16 +0000 Subject: [PATCH 13/52] 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) From 606bd31e21ba53959ad5db5717118c7f968ab0d1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:36:34 +0000 Subject: [PATCH 14/52] 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}" \ From 76b069a51e301658bb44995e8e0ee4ef2ae989ab Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 08:44:14 +0000 Subject: [PATCH 15/52] 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}" \ From a0451c42de17e0683ba7c91faf6c3e27843baae4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 09:53:19 +0000 Subject: [PATCH 16/52] 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 From cf878470a566d83d2550dccf894a15639ed55ffd Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 09:57:25 +0000 Subject: [PATCH 17/52] 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: From 86ff97b31113dee03b1c2cd8f958a5634b340732 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:00:20 +0000 Subject: [PATCH 18/52] 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 From 29ef6383b1aba2decf90c8bdc327a40dd132e22c Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:02:58 +0000 Subject: [PATCH 19/52] 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/* From dfc405f4b0f40b3f433256b75fffa97d93ec4fa0 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:05:44 +0000 Subject: [PATCH 20/52] 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) From 08800a4c10bf9ce3b059f2a92f61d74720091c20 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:08:01 +0000 Subject: [PATCH 21/52] 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 From c501a84d538249311a1e10e85302d042accb1863 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:18:49 +0000 Subject: [PATCH 22/52] 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" From e9d6dbaa5cd022dfc1a4c5006a620edab848eb6d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:25:34 +0000 Subject: [PATCH 23/52] 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:" From 7d8de5c78fde027b773c5b3c2e67dcdfbdebd42b Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:32:39 +0000 Subject: [PATCH 24/52] 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] From 492c70f384402f1afdc1723e2a74d356173033d5 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:37:16 +0000 Subject: [PATCH 25/52] 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' ===" From 89de720f931897f7e7047f2167e484d9bc270857 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:40:10 +0000 Subject: [PATCH 26/52] 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 From 353737bae09658b9eabbe85663df4a5373a77964 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:43:37 +0000 Subject: [PATCH 27/52] 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' ===" From ea6c490edc3b625ab9576a19fe663fc4121705d4 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:46:10 +0000 Subject: [PATCH 28/52] 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 From 8b3d04c6aa15cb543d54e64970d54a3a5be0be7f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:48:53 +0000 Subject: [PATCH 29/52] 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" \ From 3d59cb1b68b65f871ded569dffc8b71e52d309f1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:51:23 +0000 Subject: [PATCH 30/52] 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] From f3060013d30ce5bd78d72db9a0c259b02993f282 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:52:31 +0000 Subject: [PATCH 31/52] 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 From cfe7924d2511c0fd31828403a3960d829195868d Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:54:43 +0000 Subject: [PATCH 32/52] 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 From 78806115bac35f7d659afff0cdc5c653c6a43b5a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 10:57:33 +0000 Subject: [PATCH 33/52] 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 From 065744d15a2a6a5d61286269e65b06779f31410f Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:04:27 +0000 Subject: [PATCH 34/52] 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" \ From 260897dd874b116d55b6a6fc7809e110559ce6dd Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:07:15 +0000 Subject: [PATCH 35/52] 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] From b0f78e395fa9673895189ccfef00c172bb98bcb7 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:09:37 +0000 Subject: [PATCH 36/52] 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}" \ From ed508765eb295a0a8f5979b9fe700b9a4702a6d1 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:14:18 +0000 Subject: [PATCH 37/52] 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/52] 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] From 9efa5a132fc5775c8dc3d6ca5bb0cbb18cdfa0a9 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:21:05 +0000 Subject: [PATCH 39/52] 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] From d5c8e3a683fc46e6054d92f01eac7e2ed3615b18 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:37:06 +0000 Subject: [PATCH 40/52] 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" \ From d007e360819356a6e5e871637be4c59c69513d70 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:42:51 +0000 Subject: [PATCH 41/52] 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" \ From 8f859e0cc7f26884be0583f9547a9cfde27ac7e8 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:46:07 +0000 Subject: [PATCH 42/52] 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" \ From 6b985d2cf71f0577d280eb4d9992a1fcb74a3822 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:48:23 +0000 Subject: [PATCH 43/52] 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] From 1051e22ab3660c7c8002803b53b23361451c5a75 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 11:55:05 +0000 Subject: [PATCH 44/52] 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 From c15b325950f15425da04cc38d908c52a844e5acc Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:04:46 +0000 Subject: [PATCH 45/52] 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] From f7926c78ad8000ed770a4b13d3f94abe60b971b3 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:11:29 +0000 Subject: [PATCH 46/52] 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 From 9a6f2040cf45734b3e17a557a8aa33a6da8c2b21 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:17:32 +0000 Subject: [PATCH 47/52] 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] From c5b6b10928f532db7b3d66216fa6ee92b0bceb1a Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:37:08 +0000 Subject: [PATCH 48/52] 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 From 448e9c554dca2d14c8d3fe1b836ded0501c72311 Mon Sep 17 00:00:00 2001 From: trent Date: Thu, 15 Jan 2026 12:55:30 +0000 Subject: [PATCH 49/52] 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] From 4f48158bc7c6de9ce0a5107310ca79f58343ca58 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Wed, 25 Mar 2026 13:11:35 +0100 Subject: [PATCH 50/52] * Fixed precision --- SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs index adc3804..367dae2 100644 --- a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs +++ b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs @@ -161,13 +161,13 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.BlanketQty).IsRequired(false).HasColumnName("blanket_qty"); entity.Property(e => e.EffectiveDate).HasColumnName("eff_date"); entity.Property(e => e.ExpirationDate).HasColumnName("exp_date"); - entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price"); + entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price").HasPrecision(20, 8); entity.Property(e => e.Status).IsRequired(false).HasColumnName("stat").HasMaxLength(1); entity.Property(e => e.PromiseDate).HasColumnName("promise_date"); entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3); entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3); entity.Property(e => e.BlanketQtyReleased).IsRequired(false).HasColumnName("blanket_qty_conv"); - entity.Property(e => e.ContPriceReleased).IsRequired(false).HasColumnName("cont_price_conv"); + entity.Property(e => e.ContPriceReleased).HasPrecision(20, 8).IsRequired(false).HasColumnName("cont_price_conv"); entity.Property(e => e.QtySent).IsRequired(false).HasColumnName("qty_bco"); entity.Property(e => e.SentCode).IsRequired(false).HasColumnName("bco_code").HasMaxLength(1); entity.Property(e => e.NonAppliedData).IsRequired(false).HasColumnName("non_appl_data").HasMaxLength(75); @@ -216,8 +216,8 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.QtyShipped).IsRequired(false).HasColumnName("qty_shipped"); entity.Property(e => e.QtyPacked).IsRequired(false).HasColumnName("qty_packed"); entity.Property(e => e.Discount).IsRequired(false).HasColumnName("disc"); - entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost"); - entity.Property(e => e.Price).IsRequired(false).HasColumnName("price"); + entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost").HasPrecision(20, 8); + entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasPrecision(20, 8); entity.Property(e => e.RefType).IsRequired(false).HasColumnName("ref_type").HasMaxLength(1); entity.Property(e => e.RefNumber).IsRequired(false).HasColumnName("ref_num").HasMaxLength(10); entity.Property(e => e.RefLineSuf).IsRequired(false).HasColumnName("ref_line_suf"); @@ -474,7 +474,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.BlanketQty).HasColumnName("blanket_qty"); entity.Property(e => e.EffDate).HasColumnName("eff_date").IsRequired(false); entity.Property(e => e.ExpDate).HasColumnName("exp_date").IsRequired(false); - entity.Property(e => e.ContPrice).HasColumnName("cont_price").IsRequired(false); + entity.Property(e => e.ContPrice).HasColumnName("cont_price").HasPrecision(20, 8).IsRequired(false); entity.Property(e => e.Stat).HasColumnName("stat").HasMaxLength(2).IsRequired(false); entity.Property(e => e.PromiseDate).HasColumnName("promise_date").IsRequired(false); entity.Property(e => e.Pricecode).HasColumnName("pricecode").HasMaxLength(6).IsRequired(false); @@ -2344,6 +2344,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.ContPrice) .HasColumnName("cont_price") + .HasPrecision(20, 8) .IsRequired(false); entity.Property(e => e.BrkQty1) From f5ba09f58db9942d6e37ccd8ca92938e5ec9b3c2 Mon Sep 17 00:00:00 2001 From: Piotr Kus Date: Fri, 10 Apr 2026 06:06:25 +0200 Subject: [PATCH 51/52] * Fixed issue with wrong prices in columns --- .../SytelineSaAppDbContext.cs | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs index 367dae2..dd8d5e3 100644 --- a/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs +++ b/SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs @@ -32,7 +32,7 @@ namespace SytelineSaAppEfDataModel public DbSet VatCodeAssociations { get; set; } public DbSet ItemCustPriceAlls { get; set; } public DbSet EdiLogs { get; set; } - + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { var configuration = new ConfigurationBuilder() @@ -161,13 +161,13 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.BlanketQty).IsRequired(false).HasColumnName("blanket_qty"); entity.Property(e => e.EffectiveDate).HasColumnName("eff_date"); entity.Property(e => e.ExpirationDate).HasColumnName("exp_date"); - entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price").HasPrecision(20, 8); + entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price").HasColumnType("decimal(20, 8)"); entity.Property(e => e.Status).IsRequired(false).HasColumnName("stat").HasMaxLength(1); entity.Property(e => e.PromiseDate).HasColumnName("promise_date"); entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3); entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3); entity.Property(e => e.BlanketQtyReleased).IsRequired(false).HasColumnName("blanket_qty_conv"); - entity.Property(e => e.ContPriceReleased).HasPrecision(20, 8).IsRequired(false).HasColumnName("cont_price_conv"); + entity.Property(e => e.ContPriceReleased).HasColumnType("decimal(20, 8)").IsRequired(false).HasColumnName("cont_price_conv"); entity.Property(e => e.QtySent).IsRequired(false).HasColumnName("qty_bco"); entity.Property(e => e.SentCode).IsRequired(false).HasColumnName("bco_code").HasMaxLength(1); entity.Property(e => e.NonAppliedData).IsRequired(false).HasColumnName("non_appl_data").HasMaxLength(75); @@ -216,8 +216,8 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.QtyShipped).IsRequired(false).HasColumnName("qty_shipped"); entity.Property(e => e.QtyPacked).IsRequired(false).HasColumnName("qty_packed"); entity.Property(e => e.Discount).IsRequired(false).HasColumnName("disc"); - entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost").HasPrecision(20, 8); - entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasPrecision(20, 8); + entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost").HasColumnType("decimal(20, 8)"); + entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasColumnType("decimal(20, 8)"); entity.Property(e => e.RefType).IsRequired(false).HasColumnName("ref_type").HasMaxLength(1); entity.Property(e => e.RefNumber).IsRequired(false).HasColumnName("ref_num").HasMaxLength(10); entity.Property(e => e.RefLineSuf).IsRequired(false).HasColumnName("ref_line_suf"); @@ -261,7 +261,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3); entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3); entity.Property(e => e.QtyOrderedReleased).IsRequired(false).HasColumnName("qty_ordered_conv"); - entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv"); + entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv").HasColumnType("decimal(20, 8)"); entity.Property(e => e.CustomerOrderCustomerNumber).IsRequired(false).HasColumnName("co_cust_num").HasMaxLength(7); entity.Property(e => e.Packed).IsRequired(false).HasColumnName("packed"); entity.Property(e => e.Bol).IsRequired(false).HasColumnName("bol"); @@ -474,7 +474,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.BlanketQty).HasColumnName("blanket_qty"); entity.Property(e => e.EffDate).HasColumnName("eff_date").IsRequired(false); entity.Property(e => e.ExpDate).HasColumnName("exp_date").IsRequired(false); - entity.Property(e => e.ContPrice).HasColumnName("cont_price").HasPrecision(20, 8).IsRequired(false); + entity.Property(e => e.ContPrice).HasColumnName("cont_price").HasColumnType("decimal(20, 8)").IsRequired(false); entity.Property(e => e.Stat).HasColumnName("stat").HasMaxLength(2).IsRequired(false); entity.Property(e => e.PromiseDate).HasColumnName("promise_date").IsRequired(false); entity.Property(e => e.Pricecode).HasColumnName("pricecode").HasMaxLength(6).IsRequired(false); @@ -639,7 +639,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.Uf_FKR_EDI_ITEM_PalletCode).HasColumnName("Uf_FKR_EDI_ITEM_PalletCode").HasMaxLength(50).IsRequired(false); entity.Property(e => e.Uf_FKR_EDI_ITEM_DocumentType).IsRequired(false).HasColumnName("Uf_FKR_EDI_ITEM_DocType").HasMaxLength(50); }); - + modelBuilder.Entity(entity => { entity.ToTable("UserNames"); @@ -684,7 +684,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.Uf_ZPL_EmpNum).HasColumnName("uf_ZPL_emp_num").HasMaxLength(7).IsRequired(false); entity.Property(e => e.Uf_PLT_EmpNum).HasColumnName("uf_PLT_emp_num").HasMaxLength(14).IsRequired(false); }); - + modelBuilder.Entity(entity => { entity.ToTable("edi_users"); @@ -708,7 +708,7 @@ namespace SytelineSaAppEfDataModel entity.HasIndex(e => e.Login).IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("ZPL_InternalNum_Matltran"); @@ -887,7 +887,7 @@ namespace SytelineSaAppEfDataModel .HasMaxLength(20) .IsRequired(false); }); - + modelBuilder.Entity(entity => { entity.ToTable("wz_header"); @@ -907,12 +907,12 @@ namespace SytelineSaAppEfDataModel .HasColumnName("CreatedDate") .HasColumnType("DateTime") .IsRowVersion(); - + entity.Property(e => e.EmailAddresses) .HasColumnName("EmailAddresses") .HasMaxLength(1000) .IsRequired(false); - + entity.Property(e => e.WzNumbers) .HasColumnName("WzNumbers") .HasMaxLength(500) @@ -924,7 +924,7 @@ namespace SytelineSaAppEfDataModel .HasForeignKey(e => e.FK_Client) .HasConstraintName("wz_header_wz_clients_ID_fk"); }); - + modelBuilder.Entity(entity => { entity.ToTable("wz_clients"); @@ -949,22 +949,22 @@ namespace SytelineSaAppEfDataModel .HasColumnName("CreatedDate") .HasColumnType("DateTime") .IsRowVersion(); - + entity.Property(e => e.Name) .HasColumnName("Name") .HasMaxLength(255) .IsRequired(false); - + entity.Property(e => e.ShortName) .HasColumnName("ShortName") .HasMaxLength(30) .IsRequired(false); - + entity.Property(e => e.Logo) .HasColumnType("VARBINARY(MAX)") .IsRequired(false); }); - + modelBuilder.Entity(entity => { entity.ToTable("wz_row_meyle"); @@ -1010,12 +1010,12 @@ namespace SytelineSaAppEfDataModel .HasColumnName("part_number") .HasMaxLength(100) .IsRequired(false); - + entity.Property(e => e.TransactionNumber) .HasColumnName("trans_num") .HasColumnType("int") .IsRequired(false); - + entity.Property(e => e.FaIndex) .HasColumnName("fa_index") .HasMaxLength(100) @@ -1025,14 +1025,14 @@ namespace SytelineSaAppEfDataModel .HasColumnName("part_number_sl") .HasMaxLength(100) .IsRequired(false); - + // Relationship entity.HasOne(e => e.Header) .WithMany() .HasForeignKey(e => e.FK_Header) .HasConstraintName("wz_rows_meyle_wz_header_ID_fk"); }); - + modelBuilder.Entity(entity => { entity.ToTable("itemcust"); @@ -1175,7 +1175,7 @@ namespace SytelineSaAppEfDataModel .HasDatabaseName("IX_itemcust_RowPointer") .IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("lot"); @@ -1319,7 +1319,7 @@ namespace SytelineSaAppEfDataModel .HasDatabaseName("IX_lot_RowPointer") .IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("edi_co_import"); @@ -1553,7 +1553,7 @@ namespace SytelineSaAppEfDataModel entity.HasIndex(e => e.RowPointer).HasDatabaseName("IX_customer_RowPointer").IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("cust_tp"); @@ -1742,7 +1742,7 @@ namespace SytelineSaAppEfDataModel .HasDatabaseName("IX_cust_tp_RowPointer") .IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("item"); @@ -2001,7 +2001,7 @@ namespace SytelineSaAppEfDataModel .HasDatabaseName("IX_item_RowPointer") .IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("ZPL_VAT_CodesAssociations"); @@ -2311,7 +2311,7 @@ namespace SytelineSaAppEfDataModel .HasMaxLength(200) .IsRequired(false); }); - + modelBuilder.Entity(entity => { entity.ToTable("itemcustprice_all"); @@ -2344,7 +2344,7 @@ namespace SytelineSaAppEfDataModel entity.Property(e => e.ContPrice) .HasColumnName("cont_price") - .HasPrecision(20, 8) + .HasColumnType("decimal(20, 8)") .IsRequired(false); entity.Property(e => e.BrkQty1) @@ -2480,7 +2480,7 @@ namespace SytelineSaAppEfDataModel .HasDatabaseName("IX_itemcustprice_all_RowPointer") .IsUnique(); }); - + modelBuilder.Entity(entity => { entity.ToTable("edi_logs"); @@ -2517,7 +2517,7 @@ namespace SytelineSaAppEfDataModel .HasColumnType("datetime") .IsRequired(); }); - + modelBuilder.Entity(entity => { entity.ToTable("wz_row_mareli"); @@ -2568,12 +2568,12 @@ namespace SytelineSaAppEfDataModel .HasColumnName("wz_number") .HasMaxLength(50) .IsRequired(false); - + entity.Property(e => e.FaIndex) .HasColumnName("fa_index") .HasMaxLength(30) .IsRequired(false); - + entity.Property(e => e.TransactionNumber) .HasColumnName("trans_num") .HasColumnType("int") @@ -2587,4 +2587,4 @@ namespace SytelineSaAppEfDataModel }); } } -} +} \ No newline at end of file From 6fac50225a549b48797545c1606d61a0d22e41e2 Mon Sep 17 00:00:00 2001 From: trent Date: Fri, 10 Apr 2026 04:29:31 +0000 Subject: [PATCH 52/52] Update .woodpecker.yml --- .woodpecker.yml | 360 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 317 insertions(+), 43 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9e8913f..c9296ed 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,42 +5,158 @@ when: - merge branch: master steps: + clone-manual: + image: woodpeckerci/plugin-git + settings: + remote: http://gitea:3000/${CI_REPO}.git + branch: ${CI_COMMIT_BRANCH} + depth: 1 + detect-changed-projects: + image: alpine + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + + echo "CI_PIPELINE_FILES=${CI_PIPELINE_FILES:-}" + + apk add --no-cache findutils + + > changed-projects.txt + + echo "${CI_PIPELINE_FILES:-}" \ + | sed 's/^\[//; s/\]$//' \ + | tr ',' '\n' \ + | sed 's/^ *//; s/ *$//' \ + | sed '/^$/d' \ + | while read path; do + echo "→ changed file: $path" + + dir=$(dirname "$path") + while [ "$dir" != "." ] && [ "$dir" != "/" ]; do + csproj=$(find "$dir" -maxdepth 1 -name "*.csproj" -type f | head -n 1 || true) + if [ -n "$csproj" ]; then + echo "$csproj" >> changed-projects.txt + break + fi + dir=$(dirname "$dir") + done + done + + # unikalne projekty + sort -u -o changed-projects.txt changed-projects.txt + + echo "Zmienione projekty:" + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pipeline zakonczony." + # exit 0 = sukces, wiec kolejne kroki, ktore od niego zaleza, nie poleca + exit 0 + fi + cat changed-projects.txt + depends_on: [clone-manual] debug-location: image: alpine commands: - 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 + depends_on: [detect-changed-projects] restore: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - echo "Aktualna ścieżka: $(pwd)" + echo "Aktualna ścieżka do pliku: $(pwd)" echo "=== Restore wszystkich projektów ===" - find . -name "*.csproj" -type f -exec dotnet restore "{}" \; + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektów – nic do restore." + exit 0 + fi + + cat < NuGet.Config + + + + + + + + + EOF + + echo "=== Restore zmienionych projektów ===" + while read csproj; do + echo "→ dotnet restore $csproj" + dotnet restore "$csproj" + done < changed-projects.txt + +# find . -name "*.csproj" -type f -exec dotnet restore "{}" \; + depends_on: [detect-changed-projects] test: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" - echo "=== Uruchamianie testów ===" - dotnet test --no-restore --configuration Release --logger "trx" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam test." + exit 0 + fi + + echo "=== Konfiguracja NuGet sources ===" + cat < NuGet.Config + + + + + + + + + EOF + + echo "=== Uruchamianie testów dla zmienionych projektow ===" + while read csproj; do + echo "→ dotnet test $csproj" + dotnet test --configuration Release --logger "trx;LogFileName=tests.trx" --results-directory TestResults + done < changed-projects.txt depends_on: [restore] + pipeline-agent: + image: mcr.microsoft.com/dotnet/sdk:latest + environment: + OPENAI_API_KEY: + from_secret: openai_api_key + VAULT_URL: + from_secret: vault_url + VAULT_TOKEN: + from_secret: vault_token + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam AI-gate." + exit 0 + fi + + dotnet run --project PipelineAgent/PipelineAgent.csproj "check-changes" "$(pwd)" + depends_on: [detect-changed-projects] pack-datamodels: image: mcr.microsoft.com/dotnet/sdk:latest commands: - | set -euf cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam pack-datamodels." + exit 0 + fi + echo "=== Instalacja MinVer CLI ===" dotnet tool install --tool-path /tmp/minver minver-cli echo "=== Obliczona wersja przez MinVer ===" @@ -62,7 +178,7 @@ steps: find . -name "*.csproj" -type f | sort mkdir -p nupkg echo "=== Pakowanie projektów DataModel (wykrywane po obecności ) ===" - find . -name "*.csproj" -type f | while read csproj; do + while read csproj; do if grep -q '' "$csproj"; then PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pakuję $PROJECT_NAME ($csproj)" @@ -74,10 +190,66 @@ steps: PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME – brak " fi - done + done < changed-projects.txt echo "=== Spakowane pakiety ===" ls -la nupkg/ || echo "Brak spakowanych pakietów!" + #depends_on: [ai-agent-gate] depends_on: [test] + + publish-linux-local: + image: mcr.microsoft.com/dotnet/sdk:latest + commands: + - | + set -euf + cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam AI-gate." + exit 0 + fi + + 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 + while read csproj; do + PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") + + if [ "$PROJECT_TYPE" = "LinuxLocal" ]; then + PROJECT_NAME=$(basename "$csproj" .csproj) + echo "→ Publishing $PROJECT_NAME" + + dotnet publish "$csproj" \ + --configuration Release \ + --output "./linux-apps/$PROJECT_NAME" \ + --runtime linux-x64 \ + --self-contained false + fi + #done + done < changed-projects.txt + + 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: [ai-agent-gate] + depends_on: [test] + publish-datamodels-to-baget: image: mcr.microsoft.com/dotnet/sdk:latest environment: @@ -87,6 +259,12 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam publish-datamodels-to-baget." + exit 0 + fi + echo "=== Test połączenia z BaGetter ===" curl -f http://baget:80/v3/index.json || echo "Nie można połączyć się z BaGetter!" cat < NuGet.Config @@ -108,6 +286,7 @@ steps: --skip-duplicate done depends_on: [pack-datamodels] + select-projects-for-container: image: mcr.microsoft.com/dotnet/sdk:latest commands: @@ -115,25 +294,38 @@ steps: set -euf cd "${CI_WORKSPACE}" > projects-to-build.txt + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam select-projects-for-container." + exit 0 + fi - find . -name "*.csproj" -type f | while read csproj; do + echo "=== Selekcja projektów do konteneryzacji ===" + #find . -name "*.csproj" -type f | while read csproj; do + 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" ]]; then - PROJECT_NAME=$(basename "$csproj" .csproj) + + 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 else - PROJECT_NAME=$(basename "$csproj" .csproj) echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" fi - done + #done + done < changed-projects.txt - echo "=== Znaleziono projektow do budowy ===" - cat projects-to-build.txt || echo "Brak projektów!" - wc -l < projects-to-build.txt + echo "" + if [ -s projects-to-build.txt ]; then + echo "Znalezione projekty:" + cat projects-to-build.txt + echo "Łącznie: $(wc -l < projects-to-build.txt)" + else + echo "BRAK PROJEKTÓW DO BUDOWY!" + fi depends_on: [publish-datamodels-to-baget] + containerize-apps: image: docker:27-cli environment: @@ -145,6 +337,17 @@ steps: - | set -euf cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam contenerize-apps." + exit 0 + fi + + 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 @@ -169,16 +372,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 @@ -194,47 +401,114 @@ 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 \ -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) ===" - + rm -f "Dockerfile.temp" "Dockerfile.final" done echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" depends_on: [select-projects-for-container] + + deploy-linux-local: + image: alpine:latest + commands: + - | + cd "${CI_WORKSPACE}" + + if [ ! -s changed-projects.txt ]; then + echo "Brak zmienionych projektow – pomijam deploy-linux-local." + exit 0 + fi + + echo "=== Sprawdzanie aplikacji LinuxLocal ===" + if [ ! -d "./linux-apps" ]; then + echo "Folder ./linux-apps nie istnieje" + exit 0 + fi + + echo "=== DEBUG: Zawartość ./linux-apps/ ===" + ls -la ./linux-apps/ + + echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ===" + mkdir -p /opt/fa-apps + + cd ./linux-apps + + for app in *; do + echo "→ DEBUG: Sprawdzam $app" + + if [ ! -d "$app" ]; then + echo " → $app nie jest folderem, pomijam" + continue + fi + + echo " → Kopiuję $app" + echo " → Zawartość:" + ls -la "$app/" + + rm -rf "/opt/fa-apps/$app" + cp -r "$app" "/opt/fa-apps/$app" + + find "/opt/fa-apps/$app" -type f -executable -exec chmod +x {} \; + + echo " → Skopiowano!" + done + + cd "${CI_WORKSPACE}" + + echo "" + echo "=== Wdrożone aplikacje ===" + ls -laR /opt/fa-apps/ + depends_on: [publish-linux-local, containerize-apps] + cleanup-docker: image: docker:27-cli commands: - | - echo "=== 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 ===" + docker image prune -f + + echo "" + echo "=== Usuwanie starych wersji aplikacji ===" + docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do + echo "Usuwam: $img" + docker rmi "$img" || true + done + + echo "" + echo "=== Usuwanie kontenerów ===" docker container prune -f - echo "=== Czyszczenie build cache ===" - docker builder prune -af --filter "until=24h" + + echo "" + echo "=== Usuwanie build cache ===" + docker builder prune -af + + echo "" echo "=== Status po czyszczeniu ===" docker system df - depends_on: [containerize-apps] + depends_on: [deploy-linux-local] when: status: [success, failure]