Merge pull request #2 from henrywang/ubuntu-uki

fix: rename systemd-boot-unsigned → systemd-boot-efi for Ubuntu 26.04 and publish Ubuntu images

Author: henrywang

.github/workflows/container.yml

@@ -59,3 +59,36 @@ jobs:
           tags: ghcr.io/${{ github.repository_owner }}/composefs-os:fedora-44-uki-sb
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+      - name: Build and push composefs-os:ubuntu-26.04 (GRUB)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Containerfile.ubuntu
+          target: grub
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/composefs-os:ubuntu-26.04
+          cache-from: type=gha,scope=ubuntu
+          cache-to: type=gha,mode=max,scope=ubuntu
+
+      - name: Build and push composefs-os:ubuntu-26.04-uki (systemd-boot + UKI)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Containerfile.ubuntu
+          target: uki
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/composefs-os:ubuntu-26.04-uki
+          cache-from: type=gha,scope=ubuntu
+          cache-to: type=gha,mode=max,scope=ubuntu
+
+      - name: Build and push composefs-os:ubuntu-26.04-uki-sb (systemd-boot + UKI + Secure Boot)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Containerfile.ubuntu
+          target: uki-secureboot
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/composefs-os:ubuntu-26.04-uki-sb
+          cache-from: type=gha,scope=ubuntu
+          cache-to: type=gha,mode=max,scope=ubuntu

Containerfile.ubuntu

@@ -74,7 +74,7 @@ RUN mkdir -p /usr/share/efi/EFI/ubuntu && \
 FROM rootfs-base AS rootfs-uki
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        systemd-boot-unsigned \
+        systemd-boot-efi \
         systemd-ukify \
     && rm -rf /var/lib/apt/lists/*
 
@@ -84,9 +84,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 FROM rootfs-base AS rootfs-uki-sb
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        systemd-boot-unsigned \
+        systemd-boot-efi \
         systemd-ukify \
-        sbsigntools \
+        sbsigntool \
         openssl \
     && rm -rf /var/lib/apt/lists/*
 

README.md

@@ -24,7 +24,9 @@ See [DESIGN.md](DESIGN.md) for rationale and architecture.
 | `ghcr.io/henrywang/composefs-os:fedora-44` | GRUB (BLS Type 1) | Working |
 | `ghcr.io/henrywang/composefs-os:fedora-44-uki` | systemd-boot + UKI (BLS Type 2) | Working |
 | `ghcr.io/henrywang/composefs-os:fedora-44-uki-sb` | systemd-boot + UKI + Secure Boot | Working |
-| Ubuntu 26.04 (build locally with `Containerfile.ubuntu`) | GRUB, UKI, UKI + Secure Boot | Working |
+| `ghcr.io/henrywang/composefs-os:ubuntu-26.04` | GRUB (BLS Type 1) | Working |
+| `ghcr.io/henrywang/composefs-os:ubuntu-26.04-uki` | systemd-boot + UKI (BLS Type 2) | Working |
+| `ghcr.io/henrywang/composefs-os:ubuntu-26.04-uki-sb` | systemd-boot + UKI + Secure Boot | Working |
 | Arch Linux | — | Planned |
 
 
@@ -149,11 +151,14 @@ The published base images are a starting point. Add your own packages and
 configuration in a derived `Containerfile`:
 
 ```dockerfile
+# Fedora
 FROM ghcr.io/henrywang/composefs-os:fedora-44
-
-# Add packages
 RUN dnf install -y vim htop && dnf clean all
 
+# Ubuntu
+FROM ghcr.io/henrywang/composefs-os:ubuntu-26.04
+RUN apt-get install -y vim htop && apt-get clean
+
 # Use COPY (not RUN echo) for /etc/hostname: buildah bind-mounts a synthetic
 # /etc/hostname into every RUN container, so writes via RUN are silently lost.
 COPY <<EOF /etc/hostname