general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the cpu online file from image

Browse Source
This commit is contained in:
LI Qing 2021-07-13 14:27:21 +08:00 committed by Zongmin.Gu
parent f2e52941e8
commit 1c625f53b8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/demo_test.yml vendored
View File

@ -326,7 +326,7 @@ jobs:
run: echo "OCCLUM_VERSION=$(grep "Version =" src/pal/include/occlum_version.h | awk '{print $4}')" >> $GITHUB_ENV run: echo "OCCLUM_VERSION=$(grep "Version =" src/pal/include/occlum_version.h | awk '{print $4}')" >> $GITHUB_ENV
- name: Create container - 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 - name: Build dependencies
run: docker exec pytorch_test bash -c "cd /root/occlum; make submodule" 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 run: echo "OCCLUM_VERSION=$(grep "Version =" src/pal/include/occlum_version.h | awk '{print $4}')" >> $GITHUB_ENV
- name: Create container - 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 - name: Build dependencies
run: docker exec python_glibc_support_test bash -c "cd /root/occlum; make submodule" run: docker exec python_glibc_support_test bash -c "cd /root/occlum; make submodule"

4
tools/occlum
View File

@ -166,10 +166,8 @@ cmd_init() {
mkdir -p image/etc mkdir -p image/etc
local occlum_glibc_lib=/opt/occlum/glibc/lib local occlum_glibc_lib=/opt/occlum/glibc/lib
local occlum_glibc_etc=/opt/occlum/glibc/etc local occlum_glibc_etc=/opt/occlum/glibc/etc
local cpu_lib=/sys/devices/system/cpu
if [ -d "$occlum_glibc_lib" ]; then if [ -d "$occlum_glibc_lib" ]; then
mkdir -p "image/$occlum_glibc_lib" mkdir -p "image/$occlum_glibc_lib"
mkdir -p "image/$cpu_lib"
mkdir -p "image/$occlum_glibc_etc" mkdir -p "image/$occlum_glibc_etc"
fi fi
# add default /etc/hosts # add default /etc/hosts
@ -207,8 +205,6 @@ cmd_init() {
fi fi
cp -t "image/$occlum_glibc_etc" \ cp -t "image/$occlum_glibc_etc" \
/etc/localtime /etc/localtime
cp -t "image/$cpu_lib" \
"$cpu_lib/online"
fi fi
mkdir -p initfs mkdir -p initfs