diff --git a/core-arch.yaml b/core-arch.yaml index b8ba2b6..7bd793e 100644 --- a/core-arch.yaml +++ b/core-arch.yaml @@ -38,7 +38,7 @@ stages: - module: exec inputs: - | - git clone --revision 6e2670db89101219fc2f6bfc8be74c556147cdd1 --depth 1 https://git.ruds.io/rs2009/akshara /akshara + git clone --revision 8579f58f68893c2baaafc21764e9f61d1fb35c45 --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 diff --git a/oci.yaml b/oci.yaml index 77f3dc7..de41d9d 100644 --- a/oci.yaml +++ b/oci.yaml @@ -9,7 +9,7 @@ modules: needs-update: - | - [[ "$(cat /usr/revision)" == "$(skopeo inspect "$IMAGE_NAME" | jq '.Labels."org.opencontainers.image.revision" // "none"' -Mcrj)" ]] + [[ "$(cat /usr/revision)" != "$(skopeo inspect "$IMAGE_NAME" | jq '.Labels."org.opencontainers.image.revision" // "none"' -Mcrj)" ]] override: - path: /var/cache/blendOS/ diff --git a/ubuntu.yaml b/ubuntu.yaml index 82026bf..416eb02 100644 --- a/ubuntu.yaml +++ b/ubuntu.yaml @@ -19,36 +19,22 @@ stages: Dir::Cache::Archives /var/cache/blendOS/ubuntu/apt; EOF - - module: apt-install - inputs: - - python3 - - python3-click - - python3-requests - - python3-fasteners - - umoci - - skopeo - - jq - - git - - sudo - - pacman - - linux-generic - - systemd - - systemd-container - - locales - - grub2-common - - ubuntu-standard - - dracut - - module: exec inputs: - | - git clone --revision 6e2670db89101219fc2f6bfc8be74c556147cdd1 --depth 1 https://git.ruds.io/rs2009/akshara /akshara + git clone --revision 8579f58f68893c2baaafc21764e9f61d1fb35c45 --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 +post-stages: + - module: exec + inputs: + - locale-gen + - dracut --force --regenerate-all + override: - path: /var/lib/dpkg/ keep: new @@ -66,4 +52,4 @@ override: keep: old env: - IMAGE_NAME: docker://docker.io/library/ubuntu:rolling + IMAGE_NAME: docker://ghcr.io/rudraswat/ubuntu-rolling-gnome