Browse Source

支持使用docker进行构建

fslongjin 2 years ago
parent
commit
63c40fec13
3 changed files with 14 additions and 8 deletions
  1. 7 2
      run.sh
  2. 0 6
      tools/Dockerfile
  3. 7 0
      tools/build_in_docker.sh

+ 7 - 2
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

+ 0 - 6
tools/Dockerfile

@@ -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

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