Add experimental compose rootfs

The loss of the buildah feature forces us to have a flow like this.

What we output here is an ostree-container aka `bare-split-xattrs`
format.

Signed-off-by: Colin Walters <[email protected]>

.github/workflows/ci.yaml

@@ -200,6 +200,30 @@ jobs:
         run: tar -C / -xzvf install.tar
       - name: Integration tests
         run: env TMPDIR=/var/tmp JOBS=3 ./tests/compose-image.sh
+  compose-rootfs:
+    name: "compose-rootfs tests"
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      # https://github.com/containers/podman/discussions/17362
+      - name: Get a newer podman for heredoc support (from debian testing)
+        run: |
+          set -eux
+          echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
+          sudo apt update
+          sudo apt install -y crun/testing podman/testing skopeo/testing
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Download build
+        uses: actions/[email protected]
+        with:
+          name: install.tar
+      - name: Install
+        run: tar -C / -xzvf install.tar
+      - name: Test compose-rootfs
+        run: |
+          cd tests/compose
+          sudo podman build -v ./usr/bin/rpm-ostree:/run/build/rpm-ostree:ro --security-opt=label=disable --cap-add=all --device /dev/fuse -t localhost/test -f Containerfile .
   container-encapsulate:
     name: "Encapsulate tests"
     needs: build

Cargo.toml

@@ -73,7 +73,7 @@ openssl = "0.10.68"
 once_cell = "1.20.2"
 os-release = "0.1.0"
 # We pull this one from git, as the project is no longer published as an external crate.
-ostree-ext = { git = "https://github.com/containers/bootc", rev = "5e0df36305cfda93eab0ca70678b618d1f2844f0" }
+ostree-ext = { git = "https://github.com/containers/bootc", rev = "6663e6fe5e4615e99a8e95028f1cb975474ce8ec" }
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"

rust/src/cli_experimental.rs

@@ -31,12 +31,22 @@ enum ComposeCmd {
         #[clap(flatten)]
         opts: crate::compose::BuildChunkedOCIOpts,
     },
+    Rootfs {
+        #[clap(flatten)]
+        opts: crate::compose::RootfsOpts,
+    },
+    CommitToContainerRootfs {
+        #[clap(flatten)]
+        opts: crate::compose::CommitToContainerRootfsOpts,
+    },
 }
 
 impl ComposeCmd {
     fn run(self) -> Result<()> {
         match self {
             ComposeCmd::BuildChunkedOCI { opts } => opts.run(),
+            ComposeCmd::Rootfs { opts } => opts.run(),
+            ComposeCmd::CommitToContainerRootfs { opts } => opts.run(),
         }
     }
 }