Skip to content

Bump composefs-fs #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2025
Merged

Bump composefs-fs #1503

merged 1 commit into from
Aug 13, 2025

Conversation

cgwalters
Copy link
Collaborator

No description provided.

Signed-off-by: Johan-Liebert1 <[email protected]>
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request bumps the composefs-rs dependency to a newer revision. The changes are straightforward, including updates to Cargo.lock and Cargo.toml, and a necessary adaptation in the source code to match the updated API of the dependency. The changes look correct. I have one suggestion to improve the maintainability of the dependency specification in Cargo.toml.

@cgwalters cgwalters enabled auto-merge August 13, 2025 11:01
@bshephar
Copy link

Error from the Centos-stream-10 CI jobs is a RPM dependency issue in the build:

+ dnf -y builddep contrib/packaging/bootc.spec
Updating Subscription Management repositories.
Unable to read consumer identity

This system is not registered with an entitlement server. You can use "rhc" or "subscription-manager" to register.

CentOS Stream 10 - BaseOS                        47 MB/s | 6.7 MB     00:00    
CentOS Stream 10 - AppStream                     14 MB/s | 3.3 MB     00:00    
CentOS Stream 10 - CRB                          7.0 MB/s | 748 kB     00:00    
CentOS Stream 10 - Extras packages               40 kB/s | 6.9 kB     00:00    
Package ostree-2025.4-3.el10.x86_64 is already installed.
Package skopeo-2:1.20.0-1.el10.x86_64 is already installed.
Package systemd-257-11.el10.x86_64 is already installed.
Error: 
 Problem: cannot install both ostree-libs-2025.4-2.el10.x86_64 from appstream and ostree-libs-2025.4-3.el10.x86_64 from @System
  - package ostree-devel-2025.4-2.el10.x86_64 from crb requires ostree-libs(x86-64) = 2025.4-2.el10, but none of the providers can be installed
  - package ostree-2025.4-3.el10.x86_64 from @System requires ostree-libs(x86-64) = 2025.4-3.el10, but none of the providers can be installed
  - cannot install the best candidate for the job
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages)
Error: building at STEP "RUN <<EORUN": while running runtime: exit status 1

The Fedora job failures are definitely unrelated to this PR:

+ podman build --retry 5 --retry-delay 5s --tls-verify=false -v /var/ARTIFACTS/work-test-01-readonlykrh9qqx9/tmt/plans/integration/test-01-readonly/discover/default-0/tests:/code:z -t localhost/bootc:tmt -f /tmp/tmp.yFJXvW8Cvf/Containerfile /tmp/tmp.yFJXvW8Cvf
[1/2] STEP 1/5: FROM quay.io/fedora/fedora-bootc:44 AS build
Trying to pull quay.io/fedora/fedora-bootc:44...
Error: creating build container: unable to copy from source docker://quay.io/fedora/fedora-bootc:44: initializing source docker://quay.io/fedora/fedora-bootc:44: reading manifest 44 in quay.io/fedora/fedora-bootc: manifest unknown
+ rm -rf -- /tmp/tmp.yFJXvW8Cvf

Copy link

@bshephar bshephar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the change itself doesn't cause any issues. I don't see how the RPM dependency issue or the image pull could be related to this.

@@ -245,7 +245,8 @@ where
println!("{}", image_id.to_id());
}
OciCommand::Pull { ref image, name } => {
let (sha256, verity) = composefs_oci::pull(&repo, image, name.as_deref()).await?;
let (sha256, verity) =
composefs_oci::pull(&repo, image, name.as_deref(), None).await?;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signature changes because of the new param added to pull() here, by this commit:
containers/composefs-rs@1a08a28#diff-202658a04902f3f6a4578fa63cf9f6111413c5acfbcccd556631a9a2135dd3ffR65

Makes sense.

@bshephar
Copy link

contrib/packaging/bootc.spec

I don't see anything specific in the spec file that would be a problem with this repo specifically?
https://github.com/bootc-dev/bootc/blob/main/contrib/packaging/bootc.spec

Possibly needs a ostree specific issue to address packaging requirements and dependencies on el10?

@bshephar
Copy link

contrib/packaging/bootc.spec

I don't see anything specific in the spec file that would be a problem with this repo specifically?

https://github.com/bootc-dev/bootc/blob/main/contrib/packaging/bootc.spec

Possibly needs a ostree specific issue to address packaging requirements and dependencies on el10?

Ah, it's mentioned here too:

#1392 (comment)

So it's a known issue and being resolved by the looks of it.

@cgwalters cgwalters disabled auto-merge August 13, 2025 17:18
@cgwalters cgwalters merged commit 3e63596 into bootc-dev:main Aug 13, 2025
23 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants