From b4c70c48c73a053a208a0ae9fad270367061602f Mon Sep 17 00:00:00 2001
From: Rudra Saraswat <rs2009@ruds.io>
Date: Thu, 2 Apr 2026 05:08:43 +0100
Subject: [PATCH] feat: add container image support

---
 container-image.yaml | 69 ++++++++++++++++++++++++++++++++++++++++++++
 core-arch.yaml       |  8 +++--
 2 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 container-image.yaml

diff --git a/container-image.yaml b/container-image.yaml
new file mode 100644
index 0000000..5cce195
--- /dev/null
+++ b/container-image.yaml
@@ -0,0 +1,69 @@
+track: "base"
+
+modules:
+  - name: exec
+    run: |
+      for cmd in "$@"; do
+        bash -s <<< "$cmd"
+      done
+
+stages:
+  - module: exec
+    inputs:
+      - |
+        git clone --revision 5ec321bcb0a1019d6e64ad66e3dc55b5f1248e50 --depth 1 https://git.ruds.io/rs2009/akshara /akshara
+        cd /akshara
+        cp -a usr/lib/akshara /usr/lib/akshara
+        cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
+        cp usr/bin/akshara /usr/bin/akshara
+      - rm -rf /akshara
+
+override:
+  - path: /var/cache/blendOS/
+    keep: old
+
+auto-update:
+  enabled: true
+  interval: 3600
+
+distro-config:
+  before-stages: |
+    set -e
+
+    mkdir -p /var/cache/blendOS/container/blobs
+
+    if [[ -z "$IMAGE_NAME" ]]; then
+      echo "E: no image name specified"
+      echo "I: (define IMAGE_NAME in env section)"
+      exit 1
+    fi
+
+    skopeo copy "$IMAGE_NAME" --dest-shared-blob-dir=/var/cache/blendOS/blobs oci:image:main
+    rm -rf image/blobs
+    ln -s /var/cache/blendOS/blobs image/blobs
+    umoci unpack --image image:main bundle
+    rm image/blobs
+
+    cp -ax bundle/"$(jq '.root.path // "rootfs"' -Mcrj bundle/config.json)"/* .
+    jq '.annotations."org.opencontainers.image.revision" // empty' -Mcrj bundle/config.json > ./usr/revision
+    rm -rf bundle
+
+    mkdir -p ./var/cache/blendOS
+    mount --bind /var/cache/blendOS ./var/cache/blendOS
+
+    ln -sfn usr/lib64 ./lib64
+    ln -sfn usr/sbin ./sbin
+
+    cp /etc/locale.gen ./etc
+    cp /etc/locale.conf ./etc
+
+  after-stages: |
+    umount -l ./var/cache/blendOS &>/dev/null
+    systemd-nspawn -D . locale-gen &>/dev/null
+    systemd-nspawn -D . dracut --force --regenerate-all
+
+  should-update: |
+    [[ "$(cat /usr/revision)" == "$(skopeo inspect "$IMAGE_NAME" | jq '.Labels."org.opencontainers.image.revision" // "none"' -Mcrj)" ]]
+
+env:
+  IMAGE_NAME: ""
diff --git a/core-arch.yaml b/core-arch.yaml
index a1bcd16..00cb98b 100644
--- a/core-arch.yaml
+++ b/core-arch.yaml
@@ -18,6 +18,7 @@ modules:
 stages:
   - module: pacman-install
     inputs:
+      - "jq"
       - "git"
       - "sudo"
       - "grub"
@@ -25,6 +26,8 @@ stages:
       - "linux"
       - "linux-firmware"
       - "dracut"
+      - "skopeo"
+      - "umoci"
       - "pacman-contrib"
       - "python"
       - "python-yaml"
@@ -35,7 +38,7 @@ stages:
   - module: exec
     inputs:
       - |
-        git clone --revision eb7a52e5d690bab70063b9dc705d9546e77509ad --depth 1 https://git.ruds.io/rs2009/akshara /akshara
+        git clone --revision 2a08830ac0fa9d4d4a2491e7dd0c534cb9bf37cc --depth 1 https://git.ruds.io/rs2009/akshara /akshara
         cd /akshara
         cp -a usr/lib/akshara /usr/lib/akshara
         cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
@@ -53,8 +56,7 @@ override:
     keep: old
 
 auto-update:
-  enabled: true
-  interval: 3600
+  enabled: false
 
 distro-config:
   before-stages: |