This commit is contained in:
@@ -115,16 +115,27 @@ steps:
|
|||||||
set -euf
|
set -euf
|
||||||
cd "${CI_WORKSPACE}"
|
cd "${CI_WORKSPACE}"
|
||||||
> projects-to-build.txt
|
> projects-to-build.txt
|
||||||
|
|
||||||
|
echo "=== DEBUG: Szukam plików .csproj ==="
|
||||||
|
find . -name "*.csproj" -type f
|
||||||
|
|
||||||
find . -name "*.csproj" -type f | while read csproj; do
|
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")
|
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
|
if [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then
|
||||||
:
|
echo " → Pomijam (typ: $PROJECT_TYPE)"
|
||||||
else
|
else
|
||||||
PROJECT_NAME=$(basename "$csproj" .csproj)
|
PROJECT_NAME=$(basename "$csproj" .csproj)
|
||||||
PROJECT_DIR=$(dirname "$csproj")
|
PROJECT_DIR=$(dirname "$csproj")
|
||||||
echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt
|
echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt
|
||||||
|
echo " → Dodaję: $PROJECT_DIR|$PROJECT_NAME"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "=== DEBUG: Zawartość projects-to-build.txt ==="
|
||||||
|
cat projects-to-build.txt
|
||||||
depends_on: [publish-datamodels-to-baget]
|
depends_on: [publish-datamodels-to-baget]
|
||||||
containerize-apps:
|
containerize-apps:
|
||||||
image: woodpeckerci/plugin-docker-buildx:latest
|
image: woodpeckerci/plugin-docker-buildx:latest
|
||||||
@@ -137,27 +148,40 @@ steps:
|
|||||||
- |
|
- |
|
||||||
set -euf
|
set -euf
|
||||||
cd "${CI_WORKSPACE}"
|
cd "${CI_WORKSPACE}"
|
||||||
echo "DEBUG: envir DOCKER_HOST = ${DOCKER_HOST:-<empty>}"
|
|
||||||
echo "DEBUG: docker version:"
|
echo "=== DEBUG: Zawartość projects-to-build.txt ==="
|
||||||
docker version || echo "docker version FAIL"
|
cat projects-to-build.txt || echo "Plik nie istnieje!"
|
||||||
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 "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
|
echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
|
||||||
|
|
||||||
if [ ! -s projects-to-build.txt ]; then
|
if [ ! -s projects-to-build.txt ]; then
|
||||||
echo "Brak projektów do zbudowania"
|
echo "Brak projektów do zbudowania"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while IFS='|' read -r PROJECT_DIR PROJECT_NAME; do
|
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,,}"
|
IMAGE_NAME="trent/${PROJECT_NAME,,}"
|
||||||
FULL_IMAGE="git.modwad.pl/${IMAGE_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
|
cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -173,15 +197,18 @@ steps:
|
|||||||
ENV ASPNETCORE_URLS=http://+:8080
|
ENV ASPNETCORE_URLS=http://+:8080
|
||||||
ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"]
|
ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"]
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}"
|
echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}"
|
||||||
docker buildx build --platform linux/amd64 \
|
docker buildx build --platform linux/amd64 \
|
||||||
-t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \
|
-t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \
|
||||||
-t "${FULL_IMAGE}:latest" \
|
-t "${FULL_IMAGE}:latest" \
|
||||||
-f "${PROJECT_DIR}/Dockerfile.temp" \
|
-f "${PROJECT_DIR}/Dockerfile.temp" \
|
||||||
"${PROJECT_DIR}"
|
"${PROJECT_DIR}"
|
||||||
|
|
||||||
docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}"
|
docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}"
|
||||||
docker push "${FULL_IMAGE}:latest"
|
docker push "${FULL_IMAGE}:latest"
|
||||||
|
|
||||||
rm -f "${PROJECT_DIR}/Dockerfile.temp"
|
rm -f "${PROJECT_DIR}/Dockerfile.temp"
|
||||||
echo "Opublikowano: ${FULL_IMAGE}:latest"
|
echo "Opublikowano: ${FULL_IMAGE}:latest"
|
||||||
done < projects-to-build.txt
|
done < projects-to-build.txt
|
||||||
depends_on: [select-projects-for-container]
|
depends_on: [select-projects-for-container]
|
||||||
|
|||||||
Reference in New Issue
Block a user