From b04880f37d66a5ba6e84712602864b48ad0d23e7 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 16:45:02 -0700
Subject: [PATCH] sdfgdsfgdsfg

---
 .gitea/workflows/base-build.yml | 58 ++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 285789b..15ffaa1 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -30,42 +30,46 @@ jobs:
         run: |
           versions=($VERSIONS)
 
+          for version in "${versions[@]}"; do
+            echo "[INFO] Building Debian $version rootfs..."
+            docker build --build-arg VERSION="$version" -t fithwum/debian-$version-base .
+
+            echo "[INFO] Running container for $version"
+            docker run --rm --privileged \
+              -v "$(pwd)":/output \
+              fithwum/debian-$version-base \
+              bash -c "
+                set -euo pipefail
+                mkdir -p /output/$version
+                bash base-image-script/debian-${version}_pt1.sh
+
+                TAR=\$(find /output -maxdepth 1 -name 'debian-${version}.tar.bz2' 2>/dev/null | head -n 1)
+                if [[ -f \"\$TAR\" ]]; then
+                  echo \"[INFO] Moving tarball to /output/$version/\"
+                  mv \"\$TAR\" \"/output/$version/\"
+                fi
+
+                if [[ ! -f \"/output/$version/debian-${version}.tar.bz2\" ]]; then
+                  echo \"[ERROR] Expected tarball not found for $version!\"
+                  exit 1
+                fi
+              "
+            echo "[INFO] Finished $version"
+          done
+
           # for version in "${versions[@]}"; do
           #   echo "[INFO] Building Debian $version rootfs..."
           #   docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
 
+          #   mkdir -p "./$version"
           #   docker run --rm --privileged \
           #     -v "$(pwd)":/output \
           #     fithwum/debian-$version-base \
           #     bash base-image-script/debian-${version}_pt1.sh
-
-          #   echo "[DEBUG] Host contents after docker run for $version:" && \
-          #   find . -maxdepth 2 -type f -name "*.tar.bz2" -print
-
-          #   # Auto-detect output tarball and move it if needed
-          #   expected_path="./$version/debian-$version.tar.bz2"
-          #   fallback_path="./debian-$version.tar.bz2"
-
-          #   if [ -f "$fallback_path" ] && [ ! -f "$expected_path" ]; then
-          #     mkdir -p "./$version"
-          #     mv "$fallback_path" "$expected_path"
-          #     echo "[INFO] Moved fallback tarball to expected path: $expected_path"
-          #   fi
-          # done
-
-          for version in "${versions[@]}"; do
-            echo "[INFO] Building Debian $version rootfs..."
-            docker build --build-arg VERSION=$version -t fithwum/debian-$version-base .
-
-            mkdir -p "./$version"
-            docker run --rm --privileged \
-              -v "$(pwd)/$version":/output \
-              fithwum/debian-$version-base \
-              bash base-image-script/debian-${version}_pt1.sh
           
-              echo "[DEBUG] Checking host output dir: ./$version"
-              ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
-          done
+          #     echo "[DEBUG] Checking host output dir: ./$version"
+          #     ls -lh "./$version" || echo "[WARN] No folder or files in ./$version"
+          # done
 
       - name: List output archives
         run: |