Ryan Hughes
b8df9d3f50
The previous version made the local build the only path. Convention is the opposite: omarchy-iso-make pulls released omarchy* packages from the omacom-pkgs.org mirror by default, and only builds from local checkouts when explicitly asked via --local-source. - bin/omarchy-iso-make: only mount /omarchy-installer + /omarchy-pkgs when --local-source is set. Default has neither mount. - builder/build-iso.sh: skip build-omarchy-packages.sh when no local source. Don't filter the omarchy* names out of the pacman -Syw list in network mode (so they get downloaded from the mirror). With --local-source, the four package names are stripped after assembly so we don't re-fetch what we just built. - For the package-list source: with /omarchy-installer mounted, read omarchy-base.packages from the checkout. Without it, briefly pull the published omarchy package, extract the .packages files from it to /tmp, and use those.
117 lines
3.6 KiB
Bash
Executable File
117 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Abort if anything fails
|
|
set -e
|
|
|
|
# Parse command line arguments
|
|
NO_CACHE=""
|
|
while [[ $# -gt 0 ]]; do
|
|
case $1 in
|
|
--no-cache)
|
|
NO_CACHE=1
|
|
shift
|
|
;;
|
|
--no-boot-offer)
|
|
NO_BOOT_OFFER=1
|
|
shift
|
|
;;
|
|
--local-source)
|
|
LOCAL_SOURCE=1
|
|
OMARCHY_MIRROR=edge
|
|
shift
|
|
;;
|
|
--dev)
|
|
OMARCHY_INSTALLER_REF=dev
|
|
OMARCHY_MIRROR=edge
|
|
shift
|
|
;;
|
|
--rc)
|
|
OMARCHY_MIRROR=rc
|
|
OMARCHY_INSTALLER_REF=rc
|
|
shift
|
|
;;
|
|
*)
|
|
echo "Unknown option: $1"
|
|
echo "Usage: $0 [--no-cache] [--no-boot-offer] [--local-source] [--dev] [--rc]"
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
# Clear out old packages
|
|
sudo rm -rf /var/cache/pacman/pkg/*
|
|
|
|
# Ensure we have the submodule checked out
|
|
git submodule update --init --recursive --jobs=8
|
|
|
|
# Prepare build repo
|
|
BUILD_SCRIPT="builder/build-iso.sh"
|
|
BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
|
|
BUILD_RELEASE_PATH="$BUILD_ROOT/release"
|
|
mkdir -p "$BUILD_RELEASE_PATH"
|
|
|
|
OMARCHY_INSTALLER_REPO="${OMARCHY_INSTALLER_REPO:-basecamp/omarchy}"
|
|
OMARCHY_INSTALLER_REF="${OMARCHY_INSTALLER_REF:-master}"
|
|
OMARCHY_MIRROR="${OMARCHY_MIRROR:-stable}"
|
|
|
|
DOCKER_ARGS=(
|
|
--rm
|
|
--privileged
|
|
-e "OMARCHY_INSTALLER_REPO=$OMARCHY_INSTALLER_REPO"
|
|
-e "OMARCHY_INSTALLER_REF=$OMARCHY_INSTALLER_REF"
|
|
-e "OMARCHY_MIRROR=$OMARCHY_MIRROR"
|
|
-e "HOST_UID=$(id -u)"
|
|
-e "HOST_GID=$(id -g)"
|
|
-v "$BUILD_RELEASE_PATH/:/out/"
|
|
-v "$BUILD_ROOT/$BUILD_SCRIPT:/$BUILD_SCRIPT:ro"
|
|
-v "$BUILD_ROOT/archiso:/archiso:ro"
|
|
-v "$BUILD_ROOT/builder:/builder:ro"
|
|
-v "$BUILD_ROOT/configs:/configs:ro"
|
|
)
|
|
|
|
# --local-source: build the omarchy* packages from local omarchy-installer +
|
|
# omarchy-pkgs checkouts (mounted into the container) instead of pulling them
|
|
# from the omarchy network mirror. Useful for testing in-flight changes
|
|
# before they're released through pkgs.omarchy.org.
|
|
if [[ -n "${LOCAL_SOURCE-}" ]]; then
|
|
OMARCHY_INSTALLER_PATH="${OMARCHY_INSTALLER_PATH:-$BUILD_ROOT/../omarchy-installer}"
|
|
OMARCHY_PKGS_PATH="${OMARCHY_PKGS_PATH:-$BUILD_ROOT/../omarchy-pkgs}"
|
|
[[ -d $OMARCHY_INSTALLER_PATH ]] || { echo "Error: omarchy-installer checkout not found at $OMARCHY_INSTALLER_PATH" >&2; exit 1; }
|
|
[[ -d $OMARCHY_PKGS_PATH ]] || { echo "Error: omarchy-pkgs checkout not found at $OMARCHY_PKGS_PATH" >&2; exit 1; }
|
|
OMARCHY_INSTALLER_PATH=$(realpath "$OMARCHY_INSTALLER_PATH")
|
|
OMARCHY_PKGS_PATH=$(realpath "$OMARCHY_PKGS_PATH")
|
|
DOCKER_ARGS+=(
|
|
-v "$OMARCHY_INSTALLER_PATH:/omarchy-installer:ro"
|
|
-v "$OMARCHY_PKGS_PATH:/omarchy-pkgs:ro"
|
|
)
|
|
fi
|
|
|
|
# Use local pacman cache if you already have one on host to speed up repeat runs
|
|
if [ -d "/var/cache/pacman/pkg" ]; then
|
|
DOCKER_ARGS+=(-v "/var/cache/pacman/pkg:/var/cache/pacman/pkg")
|
|
fi
|
|
|
|
# Mount the build cache directory where packages are downloaded
|
|
if [[ -z "$NO_CACHE" ]]; then
|
|
# using a dated dir on the host to refresh daily if building multiple times
|
|
BUILD_DATE=$(date +%Y-%m-%d)
|
|
OFFLINE_REPO_BUILD_CACHE_DIR="$HOME/.cache/omarchy/iso_${BUILD_DATE}/airootfs/var/cache/omarchy"
|
|
mkdir -p "$OFFLINE_REPO_BUILD_CACHE_DIR"
|
|
# Mount to /var/cache/airootfs/var/cache/omarchy since that's where repo packages go in the ISO
|
|
DOCKER_ARGS+=(-v "$OFFLINE_REPO_BUILD_CACHE_DIR:/var/cache/airootfs/var/cache/omarchy")
|
|
fi
|
|
|
|
# Run the builder with assembled args
|
|
docker run "${DOCKER_ARGS[@]}" archlinux/archlinux:latest /$BUILD_SCRIPT
|
|
|
|
# Move as install ref
|
|
latest_iso=$(\ls -t "$BUILD_RELEASE_PATH"/*.iso | head -n1)
|
|
iso_ref="${latest_iso%.*}-$OMARCHY_INSTALLER_REF.iso"
|
|
mv -f "$latest_iso" "$iso_ref"
|
|
|
|
# Offer to boot the new build
|
|
if [[ -z "$NO_BOOT_OFFER" ]]; then
|
|
echo
|
|
gum confirm "Boot $iso_ref?" && omarchy-iso-boot "$iso_ref"
|
|
fi
|