Modify Dockerfile and bump the version file

This commit is contained in:
Cautreoxit 2024-08-21 15:00:20 +08:00 committed by Tate, Hongliang Tian
parent 90688286aa
commit 1833f8047e
16 changed files with 32 additions and 31 deletions

View File

@ -54,7 +54,7 @@ jobs:
fail-fast: false fail-fast: false
timeout-minutes: 60 timeout-minutes: 60
container: container:
image: asterinas/asterinas:0.6.2 image: asterinas/asterinas:0.7.0
options: --device=/dev/kvm options: --device=/dev/kvm
env: env:
# Need to set up proxy since the self-hosted CI server is located in China, # Need to set up proxy since the self-hosted CI server is located in China,

View File

@ -16,7 +16,7 @@ jobs:
osdk-publish: osdk-publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 10 timeout-minutes: 10
container: asterinas/asterinas:0.6.2 container: asterinas/asterinas:0.7.0
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -39,7 +39,7 @@ jobs:
ostd-publish: ostd-publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 10 timeout-minutes: 10
container: asterinas/asterinas:0.6.2 container: asterinas/asterinas:0.7.0
strategy: strategy:
matrix: matrix:
# All supported targets, this array should keep consistent with # All supported targets, this array should keep consistent with

View File

@ -16,7 +16,7 @@ jobs:
build_and_deploy: build_and_deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.6.2 container: asterinas/asterinas:0.7.0
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -17,4 +17,4 @@ jobs:
uses: pxpm/github-tag-action@1.0.1 uses: pxpm/github-tag-action@1.0.1
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
tag: v0.6.2 tag: v0.7.0

View File

@ -14,9 +14,9 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'pull_request' if: github.event_name == 'push' || github.event_name == 'pull_request'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.6.2 container: asterinas/asterinas:0.7.0
steps: steps:
- run: echo "Running in asterinas/asterinas:0.6.2" - run: echo "Running in asterinas/asterinas:0.7.0"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -28,9 +28,9 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'pull_request' if: github.event_name == 'push' || github.event_name == 'pull_request'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.6.2 container: asterinas/asterinas:0.7.0
steps: steps:
- run: echo "Running in asterinas/asterinas:0.6.2" - run: echo "Running in asterinas/asterinas:0.7.0"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -49,10 +49,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 30 timeout-minutes: 30
container: container:
image: asterinas/asterinas:0.6.2 image: asterinas/asterinas:0.7.0
options: --device=/dev/kvm options: --device=/dev/kvm
steps: steps:
- run: echo "Running in asterinas/asterinas:0.6.2" - run: echo "Running in asterinas/asterinas:0.7.0"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -88,7 +88,7 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
timeout-minutes: 30 timeout-minutes: 30
container: container:
image: asterinas/asterinas:0.6.2-tdx image: asterinas/asterinas:0.7.0-tdx
options: --device=/dev/kvm --privileged options: --device=/dev/kvm --privileged
env: env:
# Need to set up proxy since the self-hosted CI server is located in China, # Need to set up proxy since the self-hosted CI server is located in China,
@ -96,7 +96,7 @@ jobs:
RUSTUP_DIST_SERVER: https://mirrors.ustc.edu.cn/rust-static RUSTUP_DIST_SERVER: https://mirrors.ustc.edu.cn/rust-static
RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup
steps: steps:
- run: echo "Running in asterinas/asterinas:0.6.2-tdx" - run: echo "Running in asterinas/asterinas:0.7.0-tdx"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up the environment - name: Set up the environment
run: | run: |

View File

@ -23,7 +23,7 @@ jobs:
run: | run: |
docker run \ docker run \
--privileged --network=host --device=/dev/kvm \ --privileged --network=host --device=/dev/kvm \
-v ./:/root/asterinas asterinas/asterinas:0.6.2 \ -v ./:/root/asterinas asterinas/asterinas:0.7.0 \
make run AUTO_TEST=vsock ENABLE_KVM=0 SCHEME=microvm RELEASE_MODE=1 & make run AUTO_TEST=vsock ENABLE_KVM=0 SCHEME=microvm RELEASE_MODE=1 &
- name: Run Vsock Client on Host - name: Run Vsock Client on Host
id: host_vsock_client id: host_vsock_client

View File

@ -21,9 +21,9 @@ jobs:
timeout-minutes: 30 timeout-minutes: 30
strategy: strategy:
matrix: matrix:
# asterinas/asterinas:0.6.2 container is the developing container of asterinas, # asterinas/asterinas:0.7.0 container is the developing container of asterinas,
# asterinas/osdk:0.6.2 container is built with the intructions from Asterinas Book # asterinas/osdk:0.7.0 container is built with the intructions from Asterinas Book
container: ['asterinas/asterinas:0.6.2', 'asterinas/osdk:0.6.2'] container: ['asterinas/asterinas:0.7.0', 'asterinas/osdk:0.7.0']
container: ${{ matrix.container }} container: ${{ matrix.container }}
steps: steps:
- run: echo "Running in ${{ matrix.container }}" - run: echo "Running in ${{ matrix.container }}"
@ -32,7 +32,7 @@ jobs:
- name: Lint - name: Lint
id: lint id: lint
if: matrix.container == 'asterinas/asterinas:0.6.2' if: matrix.container == 'asterinas/asterinas:0.7.0'
run: make check_osdk run: make check_osdk
# Github's actions/checkout@v4 will result in a new user (not root) # Github's actions/checkout@v4 will result in a new user (not root)
@ -56,9 +56,9 @@ jobs:
RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup
strategy: strategy:
matrix: matrix:
# asterinas/asterinas:0.6.2-tdx container is the developing container of asterinas, # asterinas/asterinas:0.7.0-tdx container is the developing container of asterinas,
# asterinas/osdk:0.6.2-tdx container is built with the intructions from Asterinas Book # asterinas/osdk:0.7.0-tdx container is built with the intructions from Asterinas Book
container: ['asterinas/asterinas:0.6.2-tdx', 'asterinas/osdk:0.6.2-tdx'] container: ['asterinas/asterinas:0.7.0-tdx', 'asterinas/osdk:0.7.0-tdx']
container: container:
image: ${{ matrix.container }} image: ${{ matrix.container }}
options: --device=/dev/kvm --privileged options: --device=/dev/kvm --privileged
@ -67,7 +67,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Lint - name: Lint
id: lint id: lint
if: matrix.container == 'asterinas/asterinas:0.6.2-tdx' if: matrix.container == 'asterinas/asterinas:0.7.0-tdx'
run: make check_osdk run: make check_osdk
# Github's actions/checkout@v4 will result in a new user (not root) # Github's actions/checkout@v4 will result in a new user (not root)
# and thus not using the Rust environment we set up in the container. # and thus not using the Rust environment we set up in the container.

2
Cargo.lock generated
View File

@ -1065,7 +1065,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]] [[package]]
name = "ostd" name = "ostd"
version = "0.6.2" version = "0.7.0"
dependencies = [ dependencies = [
"acpi", "acpi",
"align_ext", "align_ext",

View File

@ -52,7 +52,7 @@ git clone https://github.com/asterinas/asterinas
2. Run a Docker container as the development environment. 2. Run a Docker container as the development environment.
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0
``` ```
3. Inside the container, go to the project folder to build and run Asterinas. 3. Inside the container, go to the project folder to build and run Asterinas.

View File

@ -49,7 +49,7 @@ git clone https://github.com/asterinas/asterinas
2. 运行一个作为开发环境的Docker容器。 2. 运行一个作为开发环境的Docker容器。
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0
``` ```
3. 在容器内,进入项目文件夹构建并运行星绽。 3. 在容器内,进入项目文件夹构建并运行星绽。

View File

@ -1 +1 @@
0.6.2 0.7.0

View File

@ -44,7 +44,7 @@ git clone https://github.com/asterinas/asterinas
2. Run a Docker container as the development environment. 2. Run a Docker container as the development environment.
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0
``` ```
3. Inside the container, go to the project folder to build and run Asterinas. 3. Inside the container, go to the project folder to build and run Asterinas.

View File

@ -66,7 +66,7 @@ git clone https://github.com/asterinas/asterinas
2. Run a Docker container as the development environment. 2. Run a Docker container as the development environment.
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2-tdx docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0-tdx
``` ```
3. Inside the container, 3. Inside the container,

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cargo-osdk" name = "cargo-osdk"
version = "0.6.2" version = "0.7.0"
edition = "2021" edition = "2021"
description = "Accelerate OS development with Asterinas OSDK" description = "Accelerate OS development with Asterinas OSDK"
license = "MPL-2.0" license = "MPL-2.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "ostd" name = "ostd"
version = "0.6.2" version = "0.7.0"
edition = "2021" edition = "2021"
description = "Rust OS framework that facilitates the development of and innovation in OS kernels" description = "Rust OS framework that facilitates the development of and innovation in OS kernels"
license = "MPL-2.0" license = "MPL-2.0"

View File

@ -264,7 +264,8 @@ RUN curl https://sh.rustup.rs -sSf | \
# Install cargo tools # Install cargo tools
RUN cargo install \ RUN cargo install \
cargo-binutils \ cargo-binutils \
mdbook mdbook \
typos-cli
FROM rust FROM rust