Skip to content

Commit 6bc4e6e

Browse files
authored
Merge branch 'main' into update_dev_version
2 parents cb85b43 + 9689a59 commit 6bc4e6e

File tree

6 files changed

+551
-1
lines changed

6 files changed

+551
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ attestation-verifier/src/tools/aas-manager/populate-users
1616
/attestation-verifier/src/pkg/lib/common/log/test1.log
1717
/attestation-verifier/src/pkg/lib/common/serialize/test.json
1818
/attestation-verifier/src/pkg/lib/common/serialize/test.yml
19+
trusted-workload/kata-deploy/tc-docker-deploy/target/

REUSE.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ path = [
5353
"**.github/workflows/lint.sh",
5454
"**go.mod",
5555
"**go.sum",
56+
"**/Cargo.lock",
5657
"**/.helmignore",
5758
"**/Chart.lock",
5859
"**.yml",

trusted-workload/kata-deploy/build-kata-deploy-image.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,20 @@ for file in $(find . -type f -o -type d -o -type l | sed 's|^\./||'); do
131131
done
132132
popd
133133

134+
#build tc-docker-deploy wrapper and copy to artifacts
135+
echo "INFO: Building tc-docker-deploy binary using rust:1.90 container"
136+
docker run --rm \
137+
-v "${BUILD_DIR}/tc-docker-deploy:/workspace" \
138+
-w /workspace \
139+
rust:1.90 \
140+
bash -c "rustup target add x86_64-unknown-linux-musl && \
141+
cargo build --locked --release --target x86_64-unknown-linux-musl"
142+
143+
cp "${BUILD_DIR}/tc-docker-deploy/target/x86_64-unknown-linux-musl/release/tc-docker-deploy" "${KATA_ARTIFACT_DIR}/opt/kata/bin/"
144+
chmod 755 "${KATA_ARTIFACT_DIR}/opt/kata/bin/tc-docker-deploy"
145+
chown root:root "${KATA_ARTIFACT_DIR}/opt/kata/bin/tc-docker-deploy"
146+
echo "INFO: tc-docker-deploy binary installed to ${KATA_ARTIFACT_DIR}/opt/kata/bin/tc-docker-deploy"
147+
134148
#retar the artifacts
135149
echo "INFO: Retar the artifacts"
136150
tar --zstd -cf "${KATA_ARTIFACT_NEW_NAME}" -C "${KATA_ARTIFACT_DIR}" .
@@ -157,4 +171,3 @@ rm -rf "${KATA_ARTIFACT_DIR}"
157171
rm -rf "${KATA_CONTAINERS_DIR}"
158172
rm -f "${KATA_ARTIFACT_FILE_NAME}"
159173
rm -f "${KATA_ARTIFACT_NEW_NAME}"
160-
docker rmi -f ubuntu:24.04 || true

trusted-workload/kata-deploy/tc-docker-deploy/Cargo.lock

Lines changed: 194 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2026 Intel Corporation
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
5+
[package]
6+
name = "tc-docker-deploy"
7+
version = "0.1.0"
8+
edition = "2021"
9+
license = "BSD-3-Clause"
10+
rust-version = "1.90.0"
11+
12+
[[bin]]
13+
name = "tc-docker-deploy"
14+
path = "src/main.rs"
15+
16+
[dependencies]
17+
anyhow = "1.0"
18+
env_logger = "0.10"
19+
log = "0.4"
20+
signal-hook = "0.3"
21+
walkdir = "2"

0 commit comments

Comments
 (0)