From b23aff75b34ad490c08b05cc24bba5220206410b Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 7 Jul 2025 20:15:46 -0700
Subject: [PATCH] dfgsdfgdfg

---
 .gitea/workflows/base-build.yml | 46 ++-------------------------------
 Dockerfile                      | 13 +++-------
 scripts/bootstrap-rootfs.sh     | 43 ++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 54 deletions(-)
 create mode 100644 scripts/bootstrap-rootfs.sh

diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 5e290e0..9128855 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -43,51 +43,9 @@ jobs:
 
             docker run --rm --privileged \
               -v "$(pwd)":/output \
-              --env DEBIAN_RELEASE="$version" \
+              -e VERSION="$version" \
               fithwum/debian-$version-base \
-              bash -euxo pipefail -c '
-                set -e
-
-                ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
-
-                echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
-                apt-get update
-                apt-get install -y --no-install-recommends debootstrap bzip2
-
-                debootstrap --verbose --variant=minbase --components=main,contrib,non-free \
-                  --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" \
-                  http://deb.debian.org/debian/
-
-                for dir in dev dev/pts proc sys; do
-                  mount --bind "/$dir" "$ROOTFS_DIR/$dir"
-                done
-
-                echo "[CHROOT] Configuring Debian system..."
-                chroot "$ROOTFS_DIR" /bin/bash -c "\
-                  echo 'APT::Get::Assume-Yes \"true\";' > /etc/apt/apt.conf.d/10-assume_yes && \
-                  apt-get update && \
-                  apt-get upgrade && \
-                  apt-get install --no-install-recommends software-properties-common bash wget curl nano locales && \
-                  echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \
-                  locale-gen && \
-                  update-locale LANG=en_US.UTF-8 && \
-                  apt-get remove --purge --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode || true && \
-                  apt-get clean && \
-                  apt-get install -f && \
-                  find /var/lib/apt/lists/ -type f -delete \
-                "
-
-                echo "[INFO] Unmounting system directories (ignore errors)..."
-                for dir in sys proc dev/pts dev; do
-                  umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
-                done
-
-                echo "[INFO] Creating compressed base image..."
-                mkdir -p "/output/$DEBIAN_RELEASE"
-                TARBALL="/output/$DEBIAN_RELEASE/debian-${DEBIAN_RELEASE}.tar.bz2"
-                tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
-                echo "[INFO] Tarball ready for CI to upload: $TARBALL"
-              '
+              /scripts/bootstrap-rootfs.sh
           done
 
       - name: List output archives
diff --git a/Dockerfile b/Dockerfile
index 7f2153a..c834b7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,17 +5,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 WORKDIR /builder
 
 RUN apt-get update && apt-get install -y \
-    debootstrap wget curl bash ftp-upload dirmngr locales sudo git \
+    debootstrap wget curl bash ftp-upload dirmngr locales sudo git bzip2 \
     && apt-get clean
 
-# Setup locale
-RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
-    locale-gen && \
-    update-locale LANG=en_US.UTF-8
+COPY base-image-script/ /scripts/
+RUN chmod +x /scripts/*.sh
 
-COPY base-image-script/ base-image-script/
-
-RUN chmod +x base-image-script/*.sh
-
-# Default command overridden by workflow
 CMD ["bash"]
diff --git a/scripts/bootstrap-rootfs.sh b/scripts/bootstrap-rootfs.sh
new file mode 100644
index 0000000..f6fc387
--- /dev/null
+++ b/scripts/bootstrap-rootfs.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+DEBIAN_RELEASE=${VERSION:-"buster"}
+ROOTFS_DIR="debian-${DEBIAN_RELEASE}"
+
+echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..."
+apt-get update
+apt-get install -y --no-install-recommends debootstrap bzip2
+
+debootstrap --verbose --variant=minbase --components=main,contrib,non-free \
+  --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" \
+  http://deb.debian.org/debian/
+
+for dir in dev dev/pts proc sys; do
+  mount --bind "/$dir" "$ROOTFS_DIR/$dir"
+done
+
+echo "[CHROOT] Configuring Debian system..."
+chroot "$ROOTFS_DIR" /bin/bash <<'EOF'
+echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/10-assume_yes
+apt-get update
+apt-get upgrade
+apt-get install --no-install-recommends software-properties-common bash wget curl nano locales
+echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
+locale-gen
+update-locale LANG=en_US.UTF-8
+apt-get remove --purge --allow-remove-essential pinentry-curses whiptail kmod iptables iproute2 dmidecode || true
+apt-get clean
+apt-get install -f
+find /var/lib/apt/lists/ -type f -delete
+EOF
+
+echo "[INFO] Unmounting system directories (ignore errors)..."
+for dir in sys proc dev/pts dev; do
+  umount -lf "$ROOTFS_DIR/$dir" 2>/dev/null || true
+done
+
+echo "[INFO] Creating compressed base image..."
+mkdir -p "/output/$DEBIAN_RELEASE"
+TARBALL="/output/$DEBIAN_RELEASE/debian-${DEBIAN_RELEASE}.tar.bz2"
+tar -cjf "$TARBALL" -C "$ROOTFS_DIR" .
+echo "[INFO] Tarball ready: $TARBALL"