Add support for variable repo and refs (#23)

* Add ability to define repo / refs to use

* Add bare mode

README.md

@@ -6,6 +6,21 @@ The Omarchy ISO is intended to provide a completely offline-capable installation
 
 Run `./bin/omarchy-iso-make` and the output goes into `./release`.
 
+### Environment Variables
+
+You can customize the repositories used during the build process by passing in variables:
+
+- `OMARCHY_CONFIGURATOR_REPO` - GitHub repository for the configurator (default: `omacom-io/omarchy-configurator`)
+- `OMARCHY_CONFIGURATOR_REF` - Git ref (branch/tag) for the configurator (default: `master`)
+- `OMARCHY_INSTALLER_REPO` - GitHub repository for the installer (default: `basecamp/omarchy`)
+- `OMARCHY_INSTALLER_REF` - Git ref (branch/tag) for the installer (default: `master`)
+- `OMARCHY_BARE` - Set to `true` for bare/minimal installation (default: empty/false)
+
+Example usage:
+```bash
+OMARCHY_INSTALLER_REPO="myuser/omarchy-fork" OMARCHY_INSTALLER_REF="some-feature" ./bin/omarchy-iso-make
+```
+
 ## Testing the ISO
 
 Run `./bin/omarchy-iso-boot [release/omarchy.iso]`.

bin/omarchy-iso-make

@@ -18,9 +18,22 @@ else
   BUILD_SCRIPT="builder/online.sh"
 fi
 
+OMARCHY_CONFIGURATOR_REPO="${OMARCHY_CONFIGURATOR_REPO:-omacom-io/omarchy-configurator}"
+OMARCHY_CONFIGURATOR_REF="${OMARCHY_CONFIGURATOR_REF:-master}"
+
+OMARCHY_INSTALLER_REPO="${OMARCHY_INSTALLER_REPO:-basecamp/omarchy}"
+OMARCHY_INSTALLER_REF="${OMARCHY_INSTALLER_REF:-master}"
+
+OMARCHY_BARE="${OMARCHY_BARE:-}"
+
 # Run the builder
 docker run --rm \
   --privileged \
+  -e "OMARCHY_CONFIGURATOR_REPO=$OMARCHY_CONFIGURATOR_REPO" \
+  -e "OMARCHY_CONFIGURATOR_REF=$OMARCHY_CONFIGURATOR_REF" \
+  -e "OMARCHY_INSTALLER_REPO=$OMARCHY_INSTALLER_REPO" \
+  -e "OMARCHY_INSTALLER_REF=$OMARCHY_INSTALLER_REF" \
+  -e "OMARCHY_BARE=$OMARCHY_BARE" \
   -v "$BUILD_RELEASE_PATH/:/out/" \
   -v "$BUILD_ROOT/$BUILD_SCRIPT:/$BUILD_SCRIPT:ro" \
   -v "$BUILD_ROOT/archiso:/archiso:ro" \

builder/cmds/autostart.sh

@@ -8,6 +8,9 @@ chroot_bash() {
     OMARCHY_USER_EMAIL="$(<user_email_address.txt)" \
     USER="$OMARCHY_USER" \
     HOME="/home/$OMARCHY_USER" \
+    OMARCHY_REPO="$(<omarchy_installer_repo.txt)" \
+    OMARCHY_REF="$(<omarchy_installer_ref.txt)" \
+    OMARCHY_BARE="$(<omarchy_bare.txt)" \
     /bin/bash "$@"
 }
 
@@ -65,5 +68,5 @@ EOF
   chmod 440 /mnt/etc/sudoers.d/99-omarchy-installer
 
   # Run Omarchy web installer
-  chroot_bash -lc "wget -qO- https://omarchy.org/install-dev | bash"
+  chroot_bash -lc "wget -qO- https://omarchy.org/install | bash"
 fi

builder/online.sh

@@ -21,7 +21,11 @@ printf '%s\n' "${arch_packages[@]}" >>"packages.x86_64"
 
 # Retrieve the latest configurator for setting up user and selecting install disk.
 wget -qO "airootfs/root/configurator" \
-  https://raw.githubusercontent.com/omacom-io/omarchy-configurator/HEAD/configurator
+  https://raw.githubusercontent.com/$OMARCHY_CONFIGURATOR_REPO/$OMARCHY_CONFIGURATOR_REF/configurator
+
+echo "$OMARCHY_INSTALLER_REPO" >airootfs/root/omarchy_installer_repo.txt
+echo "$OMARCHY_INSTALLER_REF" >airootfs/root/omarchy_installer_ref.txt
+echo "$OMARCHY_BARE" >airootfs/root/omarchy_bare.txt
 
 # Avoid using reflector for mirror identification as we are relying on the global CDN
 rm "airootfs/etc/systemd/system/multi-user.target.wants/reflector.service"