diff --git a/Cargo.lock b/Cargo.lock index d3428f3bc..b6374dc38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bcvk-qemu" version = "0.1.0" -source = "git+https://github.com/bootc-dev/bcvk?rev=e953294441c49bc6cd8a25fb5e6b5d7a71eaa143#e953294441c49bc6cd8a25fb5e6b5d7a71eaa143" +source = "git+https://github.com/bootc-dev/bcvk?rev=c1adfa9834aec219ea3c015e04871a46b375b0f0#c1adfa9834aec219ea3c015e04871a46b375b0f0" dependencies = [ "camino", "cap-std-ext 5.1.2", @@ -770,7 +770,7 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "composefs" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "anyhow", "composefs-ioctls", @@ -795,7 +795,7 @@ dependencies = [ [[package]] name = "composefs-boot" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "anyhow", "composefs", @@ -810,7 +810,7 @@ dependencies = [ [[package]] name = "composefs-ctl" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "anyhow", "clap", @@ -832,7 +832,7 @@ dependencies = [ [[package]] name = "composefs-ioctls" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "rustix", "thiserror 2.0.18", @@ -841,7 +841,7 @@ dependencies = [ [[package]] name = "composefs-oci" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "anyhow", "async-compression", @@ -854,7 +854,7 @@ dependencies = [ "containers-image-proxy", "fn-error-context", "hex", - "indicatif 0.18.4", + "indicatif 0.17.11", "ocidir", "rustix", "serde", @@ -870,7 +870,7 @@ dependencies = [ [[package]] name = "composefs-storage" version = "0.4.0" -source = "git+https://github.com/composefs/composefs-rs?rev=7e86960f746cff33bdc96e6fdca935f004c5ffb8#7e86960f746cff33bdc96e6fdca935f004c5ffb8" +source = "git+https://github.com/composefs/composefs-rs?rev=97b17f08960bd719a0e3ac02dd827cd9a7110503#97b17f08960bd719a0e3ac02dd827cd9a7110503" dependencies = [ "anyhow", "base64 0.22.1", @@ -879,7 +879,7 @@ dependencies = [ "crc", "flate2", "jsonrpc-fdpass", - "oci-spec", + "oci-spec 0.9.0", "rustix", "serde", "serde_json", @@ -965,7 +965,7 @@ dependencies = [ "cap-std-ext 5.1.2", "futures-util", "itertools", - "oci-spec", + "oci-spec 0.9.0", "rustix", "semver", "serde", @@ -1881,7 +1881,6 @@ checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb" dependencies = [ "console 0.16.3", "portable-atomic", - "tokio", "unicode-width", "unit-prefix", "web-time", @@ -2366,6 +2365,23 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "oci-spec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6f876ad774d6a676f7e968f5c3edacc32f90e65fe680a8b686235396556fb" +dependencies = [ + "const_format", + "derive_builder", + "getset", + "regex", + "serde", + "serde_json", + "strum", + "strum_macros", + "thiserror 2.0.18", +] + [[package]] name = "ocidir" version = "0.7.2" @@ -2378,7 +2394,7 @@ dependencies = [ "chrono", "flate2", "hex", - "oci-spec", + "oci-spec 0.9.0", "openssl", "serde", "serde_json", @@ -3393,7 +3409,7 @@ dependencies = [ "indicatif 0.18.4", "indoc", "libtest-mimic", - "oci-spec", + "oci-spec 0.10.0", "rand 0.10.1", "rexpect", "rustix", diff --git a/Cargo.toml b/Cargo.toml index a30078d8b..063646c94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ clap_mangen = { version = "0.3.0" } # [patch."https://github.com/composefs/composefs-rs"] # composefs-ctl = { path = "/path/to/composefs-rs/crates/composefs-ctl" } # The Justfile will auto-detect these and bind-mount them into container builds. -composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "7e86960f746cff33bdc96e6fdca935f004c5ffb8" } +composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "97b17f08960bd719a0e3ac02dd827cd9a7110503" } fn-error-context = "0.2.1" futures-util = "0.3" hex = "0.4.3" diff --git a/crates/tests-integration/Cargo.toml b/crates/tests-integration/Cargo.toml index 72482e554..ed2bb2a71 100644 --- a/crates/tests-integration/Cargo.toml +++ b/crates/tests-integration/Cargo.toml @@ -30,11 +30,11 @@ bootc-kernel-cmdline = { path = "../kernel_cmdline", version = "0.0.0" } # This is a git dependency — not published to crates.io. # When updating, also check the bcvk-qemu Cargo.toml for its own # dependency versions (cap-std-ext, etc.) to avoid conflicts. -bcvk-qemu = { git = "https://github.com/bootc-dev/bcvk", rev = "e953294441c49bc6cd8a25fb5e6b5d7a71eaa143" } +bcvk-qemu = { git = "https://github.com/bootc-dev/bcvk", rev = "c1adfa9834aec219ea3c015e04871a46b375b0f0" } data-encoding = "2.9" indicatif = { workspace = true } libtest-mimic = "0.8.0" -oci-spec = "0.9.0" +oci-spec = "0.10.0" rand = "0.10" rexpect = "0.7" scopeguard = "1.2.0"