From 1c625f53b8b83c30c38ff2c5466450178ff70bb2 Mon Sep 17 00:00:00 2001 From: LI Qing Date: Tue, 13 Jul 2021 14:27:21 +0800 Subject: [PATCH] Remove the cpu online file from image --- .github/workflows/demo_test.yml | 4 ++-- tools/occlum | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/demo_test.yml b/.github/workflows/demo_test.yml index 8c3d28e9..ae720ab7 100644 --- a/.github/workflows/demo_test.yml +++ b/.github/workflows/demo_test.yml @@ -326,7 +326,7 @@ jobs: run: echo "OCCLUM_VERSION=$(grep "Version =" src/pal/include/occlum_version.h | awk '{print $4}')" >> $GITHUB_ENV - name: Create container - run: docker run -itd --name=pytorch_test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-ubuntu18.04 + run: docker run -itd --cpuset-cpus="0" --name=pytorch_test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-ubuntu18.04 - name: Build dependencies run: docker exec pytorch_test bash -c "cd /root/occlum; make submodule" @@ -435,7 +435,7 @@ jobs: run: echo "OCCLUM_VERSION=$(grep "Version =" src/pal/include/occlum_version.h | awk '{print $4}')" >> $GITHUB_ENV - name: Create container - run: docker run -itd --name=python_glibc_support_test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-ubuntu18.04 + run: docker run -itd --cpuset-cpus="0" --name=python_glibc_support_test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-ubuntu18.04 - name: Build dependencies run: docker exec python_glibc_support_test bash -c "cd /root/occlum; make submodule" diff --git a/tools/occlum b/tools/occlum index 6d647b11..a6178f0c 100755 --- a/tools/occlum +++ b/tools/occlum @@ -166,10 +166,8 @@ cmd_init() { mkdir -p image/etc local occlum_glibc_lib=/opt/occlum/glibc/lib local occlum_glibc_etc=/opt/occlum/glibc/etc - local cpu_lib=/sys/devices/system/cpu if [ -d "$occlum_glibc_lib" ]; then mkdir -p "image/$occlum_glibc_lib" - mkdir -p "image/$cpu_lib" mkdir -p "image/$occlum_glibc_etc" fi # add default /etc/hosts @@ -207,8 +205,6 @@ cmd_init() { fi cp -t "image/$occlum_glibc_etc" \ /etc/localtime - cp -t "image/$cpu_lib" \ - "$cpu_lib/online" fi mkdir -p initfs