mirror of
https://github.com/asterinas/asterinas.git
synced 2025-06-22 08:53:29 +00:00
Upgrade TDX stack and refactor the Asterinas Docker system
This commit is contained in:
committed by
Tate, Hongliang Tian
parent
764e3afa7c
commit
6912cca51f
@ -54,18 +54,16 @@ grub.protocol = "linux"
|
||||
qemu.args = """\
|
||||
-accel kvm \
|
||||
-name process=tdxvm,debug-threads=on \
|
||||
-m 6G \
|
||||
-m 8G \
|
||||
-vga none \
|
||||
-monitor pty \
|
||||
-no-hpet \
|
||||
-nodefaults \
|
||||
-drive file=target/osdk/asterinas/asterinas.qcow2,if=virtio,format=qcow2 \
|
||||
-monitor telnet:127.0.0.1:9001,server,nowait \
|
||||
-bios /usr/share/qemu/OVMF.fd \
|
||||
-object tdx-guest,sept-ve-disable=on,id=tdx,quote-generation-service=vsock:2:4050 \
|
||||
-object memory-backend-memfd-private,id=ram1,size=2G \
|
||||
-cpu host,-kvm-steal-time,pmu=off,tsc-freq=1000000000 \
|
||||
-machine q35,kernel_irqchip=split,confidential-guest-support=tdx,memory-backend=ram1 \
|
||||
-bios /root/ovmf/release/OVMF.fd \
|
||||
-object tdx-guest,sept-ve-disable=on,id=tdx0 \
|
||||
-cpu host,-kvm-steal-time,pmu=off \
|
||||
-machine q35,kernel-irqchip=split,confidential-guest-support=tdx0 \
|
||||
-smp 1 \
|
||||
-nographic \
|
||||
"""
|
||||
|
@ -57,12 +57,11 @@ you will be assisted with a convenient utility script, `tools/bump_version.sh`,
|
||||
|
||||
### Commit 1: "Bump the Docker image version"
|
||||
|
||||
After updating the Docker image content
|
||||
(specified by the `tools/docker/Dockerfile.jinja` file),
|
||||
After updating the Docker image content,
|
||||
increment the Docker image version using the following command:
|
||||
|
||||
```
|
||||
bump_version.sh --docker_version_file [major | minor | patch | date]
|
||||
./bump_version.sh --docker_version_file [major | minor | patch | date]
|
||||
```
|
||||
|
||||
The second argument specifies which part of the Docker image version to increment.
|
||||
@ -82,7 +81,7 @@ write a follow-up commit to
|
||||
update all Docker image version references across the codebase.
|
||||
|
||||
```
|
||||
bump_version.sh --docker_version_refs
|
||||
./bump_version.sh --docker_version_refs
|
||||
```
|
||||
|
||||
If your purpose is to publish non-breaking changes to the Docker images,
|
||||
@ -96,7 +95,7 @@ synchronize the version number in `VERSION` with
|
||||
that in `DOCKER_IMAGE_VERSION` by running:
|
||||
|
||||
```
|
||||
bump_version.sh --version_file
|
||||
./bump_version.sh --version_file
|
||||
```
|
||||
|
||||
This command also updates all version numbers
|
||||
|
Reference in New Issue
Block a user