diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0d4abb83..27314a31 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -12,6 +12,6 @@ RUN rustup component add clippy --toolchain nightly-2024-11-05 RUN rustup component add rustfmt --toolchain nightly-2024-11-05 RUN cargo +nightly-2024-11-05 install cargo-binutils -RUN cargo install --git https://github.com/Samuka007/DADK.git --branch 007/breaking-output-path +RUN cargo install --git https://github.com/DragonOS-Community/DADK.git --branch 007/docker-multiarch ENTRYPOINT ["tini", "--"] \ No newline at end of file diff --git a/oscomp/manifest-riscv64.toml b/oscomp/manifest-riscv64.toml index 851a9fe6..7aeb8fae 100644 --- a/oscomp/manifest-riscv64.toml +++ b/oscomp/manifest-riscv64.toml @@ -4,6 +4,11 @@ # Target architecture. Options: x86_64, riscv64 arch = "riscv64" +# Builer version, affect the behavior of image generation +# Options: v1, v2 +# Default: v1, to be compatible with the old version +builder-version = "v2" + # Hypervisor config path hypervisor-config = "config/hypervisor.toml" diff --git a/oscomp/manifest-x86_64.toml b/oscomp/manifest-x86_64.toml index 5a6ed1b4..62bff0e3 100644 --- a/oscomp/manifest-x86_64.toml +++ b/oscomp/manifest-x86_64.toml @@ -4,6 +4,11 @@ # Target architecture. Options: x86_64, riscv64 arch = "x86_64" +# Builer version, affect the behavior of image generation +# Options: v1, v2 +# Default: v1, to be compatible with the old version +builder-version = "v2" + # Hypervisor config path hypervisor-config = "config/hypervisor.toml"