From eaf47d16623a331b1388bff20af6bccc6c6385ef Mon Sep 17 00:00:00 2001 From: "Hui, Chunyang" Date: Fri, 11 Jun 2021 09:37:59 +0000 Subject: [PATCH] Fix aliyunlinux image building and testing error --- .github/workflows/build_and_push_alinux2_image.yml | 2 +- tools/docker/Dockerfile.aliyunlinux | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_push_alinux2_image.yml b/.github/workflows/build_and_push_alinux2_image.yml index 04fd9dfb..d519b6d2 100644 --- a/.github/workflows/build_and_push_alinux2_image.yml +++ b/.github/workflows/build_and_push_alinux2_image.yml @@ -78,7 +78,7 @@ jobs: run: docker exec alinux2-test bash -c "cd /root/occlum; make submodule" - name: Build source - run: docker exec alinux2-test bash -c "cd /root/occlum; OCCLUM_RELEASE_BUILD=y SGX_MODE=SIM make" + run: docker exec alinux2-test bash -c "source /opt/intel/sgxsdk/environment; cd /root/occlum; OCCLUM_RELEASE_BUILD=y SGX_MODE=SIM make" - name: Integration test run: docker exec alinux2-test bash -c "cd /root/occlum; OCCLUM_LOG_LEVEL=trace SGX_MODE=SIM make test" diff --git a/tools/docker/Dockerfile.aliyunlinux b/tools/docker/Dockerfile.aliyunlinux index 9fb2e72c..a6044fa4 100644 --- a/tools/docker/Dockerfile.aliyunlinux +++ b/tools/docker/Dockerfile.aliyunlinux @@ -180,6 +180,7 @@ RUN rm -rf occlum && \ source scl_source enable devtoolset-8 && \ git clone -b $OCCLUM_BRANCH https://github.com/occlum/occlum && \ cd occlum && \ + source /opt/intel/sgxsdk/environment && \ make submodule && \ OCCLUM_RELEASE_BUILD=1 make install && \ cp -r demos /root/demos && \