github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 23:17:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5374 from Alex-Carter01/AA-tag-version

Browse Source 
osbuilder: specify Attestation Agent tag for rootfs build
This commit is contained in:
Steve Horsman 2022-11-01 17:42:35 +00:00 committed by GitHub
commit 5f5b4f7da9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@ -670,10 +670,13 @@ EOF
AA_KBC_PARAMS="offline_sev_kbc::null" envsubst < "${script_dir}/agent-config.toml.in" | tee "${ROOTFS_DIR}/etc/agent-config.toml" AA_KBC_PARAMS="offline_sev_kbc::null" envsubst < "${script_dir}/agent-config.toml.in" | tee "${ROOTFS_DIR}/etc/agent-config.toml"
fi fi
attestation_agent_url="$(get_package_version_from_kata_yaml externals.attestation-agent.url)" attestation_agent_url="$(get_package_version_from_kata_yaml externals.attestation-agent.url)"
attestation_agent_branch="$(get_package_version_from_kata_yaml externals.attestation-agent.branch)" attestation_agent_version="$(get_package_version_from_kata_yaml externals.attestation-agent.version)"
info "Install attestation-agent with KBC ${AA_KBC}" info "Install attestation-agent with KBC ${AA_KBC}"
git clone "${attestation_agent_url}" --branch "${attestation_agent_branch}" #git clone "${attestation_agent_url}" --branch "${attestation_agent_tag}" --single-branch
git clone --depth=1 "${attestation_agent_url}" attestation-agent
pushd attestation-agent/app pushd attestation-agent/app
git fetch --depth=1 origin "${attestation_agent_version}"
git checkout FETCH_HEAD
source "${HOME}/.cargo/env" source "${HOME}/.cargo/env"
target="${ARCH}-unknown-linux-${LIBC}" target="${ARCH}-unknown-linux-${LIBC}"
if [ "${AA_KBC}" == "eaa_kbc" ] && [ "${ARCH}" == "x86_64" ]; then if [ "${AA_KBC}" == "eaa_kbc" ] && [ "${ARCH}" == "x86_64" ]; then

2
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"
branch: "main" version: "e930d362c24bad62b5fa7d5079a9dc912dd78fa4"
cni-plugins: cni-plugins:
description: "CNI network plugins" description: "CNI network plugins"