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

Merge pull request #5587 from fidencio/topic/bump-confidential-containers-dependencies

Browse Source 
CC | Bump Confidential Containers dependencies
This commit is contained in:
Fabiano Fidêncio 2022-11-07 15:54:23 +01:00 committed by GitHub
commit 38b5818813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/agent/Cargo.lock generated
View File

@ -1920,7 +1920,7 @@ dependencies = [
[[package]] [[package]]
name = "image-rs" name = "image-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/image-rs?rev=60bfcfa86011355362992f91bdd92da75e75eec6#60bfcfa86011355362992f91bdd92da75e75eec6" source = "git+https://github.com/confidential-containers/image-rs?tag=v0.2.0#3aca6fd576f50b9e960309caddeb9d91573d4e69"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dircpy", "dircpy",
@ -2810,7 +2810,7 @@ dependencies = [
[[package]] [[package]]
name = "ocicrypt-rs" name = "ocicrypt-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/ocicrypt-rs?rev=2a09bd03abbfae99e065e3ec4bdddd0054a62d2f#2a09bd03abbfae99e065e3ec4bdddd0054a62d2f" source = "git+https://github.com/confidential-containers/ocicrypt-rs?tag=v0.2.0#2a09bd03abbfae99e065e3ec4bdddd0054a62d2f"
dependencies = [ dependencies = [
"aes 0.8.1", "aes 0.8.1",
"aes-gcm 0.9.4", "aes-gcm 0.9.4",
@ -4280,7 +4280,7 @@ dependencies = [
[[package]] [[package]]
name = "signature" name = "signature"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/image-rs?rev=60bfcfa86011355362992f91bdd92da75e75eec6#60bfcfa86011355362992f91bdd92da75e75eec6" source = "git+https://github.com/confidential-containers/image-rs?tag=v0.2.0#3aca6fd576f50b9e960309caddeb9d91573d4e69"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",

2
src/agent/Cargo.toml
View File

@ -68,7 +68,7 @@ toml = "0.5.8"
clap = { version = "3.0.1", features = ["derive"] } clap = { version = "3.0.1", features = ["derive"] }
# Image pull/decrypt # Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/image-rs", rev = "60bfcfa86011355362992f91bdd92da75e75eec6" } image-rs = { git = "https://github.com/confidential-containers/image-rs", tag = "v0.2.0" }
# "vendored" feature for openssl is required by musl build # "vendored" feature for openssl is required by musl build
openssl = { version = "0.10.38", features = ["vendored"] } openssl = { version = "0.10.38", features = ["vendored"] }

4
tools/packaging/static-build/td-shim/Dockerfile
View File

@ -15,7 +15,9 @@ RUN apt-get update && \
gcc \ gcc \
git \ git \
llvm \ llvm \
nasm && \ make \
nasm \
patch && \
apt-get clean && rm -rf /var/lib/lists/ && \ apt-get clean && rm -rf /var/lib/lists/ && \
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_TOOLCHAIN} && \ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_TOOLCHAIN} && \
source "$HOME/.cargo/env" && \ source "$HOME/.cargo/env" && \

4
tools/packaging/static-build/td-shim/build-td-shim.sh
View File

@ -27,11 +27,13 @@ pushd ${build_root}
git clone --single-branch "${tdshim_repo}" git clone --single-branch "${tdshim_repo}"
pushd td-shim pushd td-shim
git checkout "${tdshim_version}" git checkout "${tdshim_version}"
git submodule update --init
make preparation
bash sh_script/build_final.sh boot_kernel bash sh_script/build_final.sh boot_kernel
install_dir="${DESTDIR}/${PREFIX}/share/td-shim" install_dir="${DESTDIR}/${PREFIX}/share/td-shim"
mkdir -p ${install_dir} mkdir -p ${install_dir}
install target/x86_64-unknown-uefi/release/final-boot-kernel.bin ${install_dir}/td-shim.bin install target/release/final-boot-kernel.bin ${install_dir}/td-shim.bin
popd #td-shim popd #td-shim
popd #${build_root} popd #${build_root}

4
versions.yaml
View File

@ -186,7 +186,7 @@ externals:
attestation-agent: attestation-agent:
description: "Provide attested key unwrapping for image decryption" description: "Provide attested key unwrapping for image decryption"
url: "https://github.com/confidential-containers/attestation-agent" url: "https://github.com/confidential-containers/attestation-agent"
version: "e930d362c24bad62b5fa7d5079a9dc912dd78fa4" version: "v0.2.0"
cni-plugins: cni-plugins:
description: "CNI network plugins" description: "CNI network plugins"
@ -307,7 +307,7 @@ externals:
td-shim: td-shim:
description: "Confidential Containers Shim Firmware" description: "Confidential Containers Shim Firmware"
url: "https://github.com/confidential-containers/td-shim" url: "https://github.com/confidential-containers/td-shim"
version: "cf9592ef70bd6ba4c7ab1330d278a743f5ba3133" version: "v0.2.0"
toolchain: "nightly-2022-05-15" toolchain: "nightly-2022-05-15"
virtiofsd: virtiofsd: