From 90a72ab90b58d3e7eb99c9fffeee2e2192f0a7bc Mon Sep 17 00:00:00 2001 From: fithwum Date: Mon, 7 Jul 2025 07:12:15 -0700 Subject: [PATCH] test --- base-image-script/debian-bookworm_pt1.sh | 2 +- base-image-script/debian-bullseye_pt1.sh | 2 +- base-image-script/debian-buster_pt1.sh | 2 +- base-image-script/debian-test_pt1.sh | 2 +- base-image-script/debian-test_pt2.sh | 37 ------------------------ base-image-script/debian-trixie_pt1.sh | 2 +- 6 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 base-image-script/debian-test_pt2.sh diff --git a/base-image-script/debian-bookworm_pt1.sh b/base-image-script/debian-bookworm_pt1.sh index 776a7ab..cc7cab8 100644 --- a/base-image-script/debian-bookworm_pt1.sh +++ b/base-image-script/debian-bookworm_pt1.sh @@ -23,7 +23,7 @@ for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do done echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..." -debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/ +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" diff --git a/base-image-script/debian-bullseye_pt1.sh b/base-image-script/debian-bullseye_pt1.sh index fe58b70..01b5d99 100644 --- a/base-image-script/debian-bullseye_pt1.sh +++ b/base-image-script/debian-bullseye_pt1.sh @@ -23,7 +23,7 @@ for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do done echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..." -debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/ +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" diff --git a/base-image-script/debian-buster_pt1.sh b/base-image-script/debian-buster_pt1.sh index 380cf45..120b4ee 100644 --- a/base-image-script/debian-buster_pt1.sh +++ b/base-image-script/debian-buster_pt1.sh @@ -23,7 +23,7 @@ for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do done echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..." -debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/ +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" diff --git a/base-image-script/debian-test_pt1.sh b/base-image-script/debian-test_pt1.sh index 7755c47..ae2c24c 100644 --- a/base-image-script/debian-test_pt1.sh +++ b/base-image-script/debian-test_pt1.sh @@ -7,7 +7,7 @@ set -o pipefail DEBIAN_RELEASE="bookworm" ROOTFS_DIR="debian-${DEBIAN_RELEASE}" SCRIPTS_URL="https://gitea.fithwum.tech/fithwum/files-for-dockers/raw/branch/master/base-image-script/" -PT2_SCRIPT="debian-test_pt2.sh" +PT2_SCRIPT="debian-build_pt2.sh" PT3_SCRIPT="debian-build_pt3.sh" echo "[INFO] Preparing environment..." diff --git a/base-image-script/debian-test_pt2.sh b/base-image-script/debian-test_pt2.sh deleted file mode 100644 index 02d70c0..0000000 --- a/base-image-script/debian-test_pt2.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright (c) 2025 fithwum -# All rights reserved -echo "[CHROOT] Configuring Debian system..." -echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/10-assume_yes - -apt-get update -apt-get upgrade - -echo "[CHROOT] Installing Node.js..." -curl -fsSL https://deb.nodesource.com/setup_20.x | bash - -apt-get install --no-install-recommends nodejs - -echo "[CHROOT] Installing Docker..." -apt-get install ca-certificates curl gnupg lsb-release -mkdir -p /etc/apt/keyrings -curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg -echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null -apt-get update - -apt-get install --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -apt-get install --no-install-recommends software-properties-common bash wget curl nano python3 python3-pip python3-venv locales - -dpkg -l | grep python3-cryptography || echo "[OK] Not installed" - -echo "[CHROOT] Removing unnecessary packages..." -apt-get remove --purge --allow-remove-essential pinentry-curses whiptail dmidecode || true - -echo "[CHROOT] Cleaning up..." -apt-get clean -apt-get install -f -find /var/lib/apt/lists/ -type f -delete - -echo "[CHROOT] Done. Type 'exit' to return." -exit diff --git a/base-image-script/debian-trixie_pt1.sh b/base-image-script/debian-trixie_pt1.sh index 03390a5..8d76248 100644 --- a/base-image-script/debian-trixie_pt1.sh +++ b/base-image-script/debian-trixie_pt1.sh @@ -23,7 +23,7 @@ for SCRIPT in $PT2_SCRIPT $PT3_SCRIPT; do done echo "[INFO] Bootstrapping Debian $DEBIAN_RELEASE rootfs..." -debootstrap --variant=minbase --components=main,contrib,non-free --include=apt,ca-certificates --arch=amd64 "$DEBIAN_RELEASE" "$ROOTFS_DIR" http://deb.debian.org/debian/ +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"