github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-08 03:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8670 from mkulke/mkulke/fix-layer-ordering

Browse Source 
Bump image-rs rev to include image-layer-ordering fix
This commit is contained in:
Steve Horsman 2023-12-19 20:32:11 +00:00 committed by GitHub
commit d0df91935b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1101 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1321
src/agent/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
src/agent/Cargo.toml
View File

@ -11,7 +11,7 @@ rustjail = { path = "rustjail" }
protocols = { path = "../libs/protocols", features = ["async", "with-serde"] } protocols = { path = "../libs/protocols", features = ["async", "with-serde"] }
lazy_static = "1.3.0" lazy_static = "1.3.0"
ttrpc = { version = "0.7.1", features = ["async"], default-features = false } ttrpc = { version = "0.7.1", features = ["async"], default-features = false }
protobuf = "3.2.0" protobuf = "3.3.0"
libc = "0.2.58" libc = "0.2.58"
nix = "0.24.2" nix = "0.24.2"
capctl = "0.2.0" capctl = "0.2.0"
@ -72,7 +72,7 @@ clap = { version = "3.0.1", features = ["derive"] }
# Image pull/decrypt # Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/guest-components", tag = "v0.8.0", default-features = false, features = [ image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "a151bca6d5cc1a47f2cd91437134ad8ec9c754fe", default-features = false, features = [
"kata-cc-native-tls", "kata-cc-native-tls",
"verity", "verity",
"signature-simple-xrss", "signature-simple-xrss",

1
src/agent/src/rpc.rs
View File

@ -147,7 +147,6 @@ fn config_allows(req: &impl MessageDyn) -> ttrpc::Result<()> {
} }
} }
#[cfg(feature = "agent-policy")] #[cfg(feature = "agent-policy")]
async fn policy_allows(req: &(impl MessageDyn + serde::Serialize)) -> ttrpc::Result<()> { async fn policy_allows(req: &(impl MessageDyn + serde::Serialize)) -> ttrpc::Result<()> {
let request = serde_json::to_string(req).unwrap(); let request = serde_json::to_string(req).unwrap();

957
src/libs/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
src/libs/protocols/Cargo.toml
View File

@ -14,11 +14,11 @@ sealed-secret = []
[dependencies] [dependencies]
ttrpc = { version = "0.7.1" } ttrpc = { version = "0.7.1" }
async-trait = { version = "0.1.42", optional = true } async-trait = { version = "0.1.42", optional = true }
protobuf = { version = "3.2.0" } protobuf = { version = "3.3.0" }
serde = { version = "1.0.130", features = ["derive"], optional = true } serde = { version = "1.0.130", features = ["derive"], optional = true }
serde_json = { version = "1.0.68", optional = true } serde_json = { version = "1.0.68", optional = true }
oci = { path = "../oci" } oci = { path = "../oci" }
[build-dependencies] [build-dependencies]
ttrpc-codegen = "0.4.2" ttrpc-codegen = "0.4.2"
protobuf = { version = "3.2.0" } protobuf = { version = "3.3.0" }

1
src/runtime/virtcontainers/kata_agent.go
View File

@ -793,7 +793,6 @@ func (k *kataAgent) startSandbox(ctx context.Context, sandbox *Sandbox) error {
} }
} }
storages := setupStorages(ctx, sandbox) storages := setupStorages(ctx, sandbox)
req := &grpc.CreateSandboxRequest{ req := &grpc.CreateSandboxRequest{