diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 8781102..aba76b9 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -259,6 +259,8 @@ jobs: printf "%s%s\n" "$b" "${S[$s]}" } + echo "${{ secrets.GIT_TOKEN }}" | docker login gitea.fithwum.tech -u "${{ secrets.GIT_USERNAME }}" --password-stdin + versions=() if [[ "${{ needs.check-for-changes.outputs.should_build_alpine }}" == "true" ]]; then versions+=("alpine") @@ -276,8 +278,6 @@ jobs: infofile="$version/build-info.json" image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_TS}:$version" - echo "${{ secrets.GIT_TOKEN }}" | docker login gitea.fithwum.tech -u "${{ secrets.GIT_USERNAME }}" --password-stdin - echo "[INFO] Pulling $image" docker pull "$image" || echo "[WARN] Failed to pull $image" @@ -286,7 +286,7 @@ jobs: digest=$(docker inspect --format='{{.Id}}' "$image" 2>/dev/null || echo "unknown") fi - size_bytes=$(echo "$inspect" | grep 'Size:' | head -n1 | awk '{print $2}' || echo "0") + size_bytes=$(docker image inspect "$image" --format='{{.Size}}' 2>/dev/null || echo "0") size_bytes=${size_bytes//[^0-9]/} size_human=$(human_size "$size_bytes") base_digest="unknown" @@ -298,6 +298,12 @@ jobs: base_digest="${BASIC_DIGEST:-unknown}" fi + echo "[DEBUG] version=$version" + echo "[DEBUG] digest=$digest" + echo "[DEBUG] size_bytes=$size_bytes" + echo "[DEBUG] size_human=$size_human" + echo "[DEBUG] base_digest=$base_digest" + jq -n \ --arg version "$version" \ --arg commit "$(git rev-parse HEAD)" \