From 63c40fec13cb5ead2821d42fac358dc154a316cf Mon Sep 17 00:00:00 2001
From: fslongjin <fslongjin@vip.qq.com>
Date: Mon, 25 Jul 2022 19:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8docker?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run.sh                   | 9 +++++++--
 tools/Dockerfile         | 6 ------
 tools/build_in_docker.sh | 7 +++++++
 3 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 tools/Dockerfile
 create mode 100644 tools/build_in_docker.sh

diff --git a/run.sh b/run.sh
index 5b74ed8e..7efcbf04 100644
--- a/run.sh
+++ b/run.sh
@@ -8,8 +8,13 @@
 # 第一个参数如果是--notbuild 那就不构建，直接运行
 if [ ! "$1" == "--nobuild" ]; then
     echo "开始构建..."
-    make all -j 16
-    make clean
+    if [ "$1" == "--docker" ]; then
+        echo "使用docker构建"
+        sudo bash tools/build_in_docker.sh
+    else
+        make all -j 16
+        make clean
+    fi
 fi
 
 IA32_USE_QEMU=1
diff --git a/tools/Dockerfile b/tools/Dockerfile
deleted file mode 100644
index f2e4860d..00000000
--- a/tools/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM debian:bullseye
-RUN apt update \
-    && apt install -y git xorriso  build-essential
-VOLUME ["/user_data"]
-
-CMD tail -f /dev/null
\ No newline at end of file
diff --git a/tools/build_in_docker.sh b/tools/build_in_docker.sh
new file mode 100644
index 00000000..478f5f21
--- /dev/null
+++ b/tools/build_in_docker.sh
@@ -0,0 +1,7 @@
+docker rm -f dragonos-build
+p=`pwd`
+cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l)
+docker run -v $p:/data --name dragonos-build -i dragonos-dev:v1.0 bash << EOF
+cd /data
+make -j ${cpu_count}
+EOF
\ No newline at end of file