From 2bd2b12a0a4accec0fc18188327da2162b4b7a29 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 12 Apr 2023 11:19:33 -0300 Subject: [PATCH 1/3] agent: update image-rs dependency In preparation for CoCo 0.5 release, updated image-rs to commit b28eaae. Fixes #6650 Signed-off-by: Wainer dos Santos Moschetta --- src/agent/Cargo.lock | 4 ++-- src/agent/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index e09dd0eec1..8b82d510f8 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1802,7 +1802,7 @@ dependencies = [ [[package]] name = "image-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/image-rs?rev=cc626a97a8225475d3a4c3c7490f6b212ca32466#cc626a97a8225475d3a4c3c7490f6b212ca32466" +source = "git+https://github.com/confidential-containers/image-rs?rev=b28eaae#b28eaae46bcea69ac28d079381b7aa1ef6851ad9" dependencies = [ "anyhow", "async-compression", @@ -2656,7 +2656,7 @@ dependencies = [ [[package]] name = "ocicrypt-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/ocicrypt-rs.git?rev=1053963#105396323715ea6787b2241c93ed87a3307dec2a" +source = "git+https://github.com/confidential-containers/ocicrypt-rs?rev=55ab22d#55ab22d572ec385ba466085f3c78f4148dfd287e" dependencies = [ "aes 0.8.2", "anyhow", diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index a07d397f39..3d8f4b9d41 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -72,10 +72,10 @@ openssl = { version = "0.10.38", features = ["vendored"] } # Image pull/decrypt [target.'cfg(target_arch = "s390x")'.dependencies] -image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "cc626a97a8225475d3a4c3c7490f6b212ca32466", default-features = false, features = ["kata-cc-s390x"] } +image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "b28eaae", default-features = false, features = ["kata-cc-s390x"] } [target.'cfg(not(target_arch = "s390x"))'.dependencies] -image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "cc626a97a8225475d3a4c3c7490f6b212ca32466", default-features = false, features = ["kata-cc"] } +image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "b28eaae", default-features = false, features = ["kata-cc"] } [patch.crates-io] oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" } From 6cd74b4530bc5acf26c719d5a56157b31913db2d Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 12 Apr 2023 11:26:20 -0300 Subject: [PATCH 2/3] versions: update attestation-agent dependency In preparation for CoCo 0.5 release, updated attestation-agent to commit c939d211fe5ac497715008e36161aff20cabb6e6 Fixes #6650 Signed-off-by: Wainer dos Santos Moschetta --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 42ea5daaa7..763131f1a5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -190,7 +190,7 @@ externals: attestation-agent: description: "Provide attested key unwrapping for image decryption" url: "https://github.com/confidential-containers/attestation-agent" - version: "d7ace56f2f2c861669ab07b50598a3d3c22709af" + version: "c939d211fe5ac497715008e36161aff20cabb6e6" cni-plugins: description: "CNI network plugins" From 255605284815b95dfdec25df92f16a35e1676e9d Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 12 Apr 2023 11:35:28 -0300 Subject: [PATCH 3/3] versions: update td-shim dependency In preparation for CoCo 0.5 release, updated td-shim to commit 10568bab569bc40034cc973f26fbb0a768dcc3e3 Signed-off-by: Wainer dos Santos Moschetta --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 763131f1a5..f1cd298083 100644 --- a/versions.yaml +++ b/versions.yaml @@ -310,7 +310,7 @@ externals: td-shim: description: "Confidential Containers Shim Firmware" url: "https://github.com/confidential-containers/td-shim" - version: "v0.4.0" + version: "10568bab569bc40034cc973f26fbb0a768dcc3e3" toolchain: "nightly-2022-11-15" virtiofsd: