Skip to content

Commit a199bd0

Browse files
Bump composefs-fs
Signed-off-by: Johan-Liebert1 <[email protected]>
1 parent 71a2fae commit a199bd0

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ anyhow = "1.0.82"
3636
camino = "1.1.6"
3737
canon-json = "0.2.1"
3838
cap-std-ext = "4.0.3"
39-
composefs = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs", features = ["rhel9"] }
40-
composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-boot" }
41-
composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-oci" }
39+
composefs = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs", features = ["rhel9"] }
40+
composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs-boot" }
41+
composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "8d1e570275621531d39b8f01681584bcc85ce01c", package = "composefs-oci" }
4242
chrono = { version = "0.4.38", default-features = false }
4343
clap = "4.5.4"
4444
clap_mangen = { version = "0.2.20" }

crates/lib/src/cfsctl.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ where
245245
println!("{}", image_id.to_id());
246246
}
247247
OciCommand::Pull { ref image, name } => {
248-
let (sha256, verity) = composefs_oci::pull(&repo, image, name.as_deref()).await?;
248+
let (sha256, verity) =
249+
composefs_oci::pull(&repo, image, name.as_deref(), None).await?;
249250

250251
println!("sha256 {}", hex::encode(sha256));
251252
println!("verity {}", verity.to_hex());

crates/lib/src/install.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,13 @@ async fn initialize_composefs_repository(
15641564
} = &state.source.imageref;
15651565

15661566
// transport's display is already of type "<transport_type>:"
1567-
composefs_oci_pull(&Arc::new(repo), &format!("{transport}{image_name}"), None).await
1567+
composefs_oci_pull(
1568+
&Arc::new(repo),
1569+
&format!("{transport}{image_name}"),
1570+
None,
1571+
None,
1572+
)
1573+
.await
15681574
}
15691575

15701576
fn get_booted_bls() -> Result<BLSConfig> {
@@ -2099,9 +2105,10 @@ pub(crate) async fn pull_composefs_repo(
20992105

21002106
let repo = open_composefs_repo(&rootfs_dir).context("Opening compoesfs repo")?;
21012107

2102-
let (id, verity) = composefs_oci_pull(&Arc::new(repo), &format!("{transport}:{image}"), None)
2103-
.await
2104-
.context("Pulling composefs repo")?;
2108+
let (id, verity) =
2109+
composefs_oci_pull(&Arc::new(repo), &format!("{transport}:{image}"), None, None)
2110+
.await
2111+
.context("Pulling composefs repo")?;
21052112

21062113
tracing::debug!(
21072114
"id = {id}, verity = {verity}",

0 commit comments

Comments
 (0)