From d04f9e2ea2ab3b35c10b3d444160004462428714 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 Jan 2026 16:31:44 -0500 Subject: [PATCH 1/2] oci/skopeo: Fix ensure_config return value inconsistency The ensure_config function was returning inconsistent values: - When config already exists: returned (config_digest, config_id) - When config is newly written: returned (content_id, config_id) The content_id has the 'oci-config-' prefix added, while config_digest does not. This caused downstream code (like bootc) to double-prefix the identifier when calling create_filesystem, resulting in paths like 'oci-config-oci-config-sha256:...' instead of 'oci-config-sha256:...'. Return the raw config_digest consistently in both cases. Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters --- crates/composefs-oci/src/skopeo.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/composefs-oci/src/skopeo.rs b/crates/composefs-oci/src/skopeo.rs index 12972167..ce915df5 100644 --- a/crates/composefs-oci/src/skopeo.rs +++ b/crates/composefs-oci/src/skopeo.rs @@ -196,7 +196,7 @@ impl ImageOp { splitstream.write_inline(&raw_config); let config_id = self.repo.write_stream(splitstream, &content_id, None)?; - Ok((content_id, config_id)) + Ok((config_digest.to_string(), config_id)) } } From 780b1415f11990fb8cae2ad1dba3f4936fff01f6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 Jan 2026 16:31:52 -0500 Subject: [PATCH 2/2] ci/bootc-revdep: Point to bootc PR #1791 for API compatibility The recent API changes in composefs-rs (splitstream rework, sync story) require corresponding updates in bootc. PR #1791 in bootc-dev/bootc contains those updates. Once that PR is merged, this should be changed back to track bootc main. Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters --- .github/workflows/bootc-revdep.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bootc-revdep.yml b/.github/workflows/bootc-revdep.yml index 4d04c5dd..0d553afe 100644 --- a/.github/workflows/bootc-revdep.yml +++ b/.github/workflows/bootc-revdep.yml @@ -29,7 +29,10 @@ jobs: - name: Checkout bootc repository uses: actions/checkout@v5 with: - repository: containers/bootc + repository: bootc-dev/bootc + # Use the PR that updates bootc to the current composefs-rs API. + # Once merged, change this back to 'main' or a release tag. + ref: refs/pull/1791/head path: bootc - name: Bootc Ubuntu Setup @@ -37,6 +40,12 @@ jobs: with: libvirt: true + - name: Install tmt + run: | + sudo apt-get install -y pipx + pipx install tmt[provision] + echo "$HOME/.local/bin" >> $GITHUB_PATH + - name: Patch bootc to use current composefs-rs working-directory: bootc run: |