瀏覽代碼

feat(build): use dadk with version isolation (#10)

Samuel Dai 6 天之前
父節點
當前提交
fa36c44f8f
共有 3 個文件被更改,包括 11 次插入1 次删除
  1. 1 1
      .devcontainer/Dockerfile
  2. 5 0
      oscomp/manifest-riscv64.toml
  3. 5 0
      oscomp/manifest-x86_64.toml

+ 1 - 1
.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", "--"]

+ 5 - 0
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"
 

+ 5 - 0
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"