diff --git a/.woodpecker.yml b/.woodpecker.yml index bc53b90..5cbcd0b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -53,14 +53,14 @@ steps: --minimum-major-minor 2.0 \ --default-pre-release-identifiers alpha.0 \ --verbosity info) - + echo "Wersja: $MINVER_VERSION" - + mkdir -p nupkg echo "=== Pełniejsze fetch git (unshallow + tags) ===" git fetch --prune --unshallow || echo "Już full clone – OK" git fetch --tags - + echo "=== Dostępne tagi ===" git tag -l echo "=== Aktualny commit i opis ===" @@ -119,21 +119,13 @@ steps: containerize-apps: image: woodpeckerci/plugin-docker-buildx:latest - settings: - registry: git.modwad.pl - username: - from_secret: gitea_registry_user - password: - from_secret: gitea_registry_token commands: - | set -euf cd "${CI_WORKSPACE}" - # Logowanie do rejestru - echo "${PLUGIN_PASSWORD}" | docker login "${PLUGIN_REGISTRY}" -u "${PLUGIN_USERNAME}" --password-stdin + echo "${GITEA_REGISTRY_TOKEN}" | docker login git.modwad.pl -u "${GITEA_REGISTRY_USER}" --password-stdin - # Restore raz jeszcze – bo w tym kroku nie mamy zależności od wcześniejszego restore dotnet restore find . -name "*.csproj" -type f | while read csproj; do @@ -144,31 +136,30 @@ steps: 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 konteneryzację $PROJECT_NAME ($PROJECT_TYPE)" + echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)" continue fi - IMAGE_NAME="projekty/${PROJECT_NAME,,}" # np. projekty/customerapi - FULL_IMAGE="${PLUGIN_REGISTRY}/${IMAGE_NAME}" + IMAGE_NAME="projekty/${PROJECT_NAME,,}" + FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}" - # Generujemy tymczasowy Dockerfile - cat <<'EOF' > "${PROJECT_DIR}/Dockerfile.temp" -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -WORKDIR /app -EXPOSE 8080 + 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 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 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 \