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

Update base image from CentOS 8.1 to CentOS 8.2

Browse Source
This commit is contained in:
zongmin.gu 2021-03-01 15:42:26 +08:00 committed by Zongmin.Gu
parent d192b9c948
commit 9af92f2ebf
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -27,7 +27,7 @@ If applicable, add logs to help explain your problem.
# Environment # Environment
<!--- Please complete the following information --> <!--- Please complete the following information -->
- HW: [e.g. SGX1, SGX2] - HW: [e.g. SGX1, SGX2]
- OS: [e.g. Ubuntu18.04, CentOS8.1] - OS: [e.g. Ubuntu18.04, CentOS8.2]
- Occlum version: [e.g. 0.17.0] - Occlum version: [e.g. 0.17.0]
# Additional context # Additional context

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

@ -52,11 +52,11 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
file: ./tools/docker/Dockerfile.centos8.1 file: ./tools/docker/Dockerfile.centos8.2
platforms: linux/amd64 platforms: linux/amd64
build-args: OCCLUM_BRANCH=${{ env.OCCLUM_BRANCH }} build-args: OCCLUM_BRANCH=${{ env.OCCLUM_BRANCH }}
push: true push: true
tags: occlum/occlum:${{ env.RELEASE_VERSION }}-centos8.1 tags: occlum/occlum:${{ env.RELEASE_VERSION }}-centos8.2
generate-ubuntu-image: generate-ubuntu-image:

2
.github/workflows/main.yml vendored
View File

@ -54,7 +54,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 with centos image - name: Create container with centos image
run: docker run -itd --name=centos-test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-centos8.1 run: docker run -itd --name=centos-test -v $GITHUB_WORKSPACE:/root/occlum occlum/occlum:${{ env.OCCLUM_VERSION }}-centos8.2
- name: Check format - name: Check format
run: docker exec centos-test bash -c 'cd /root/occlum; info=$(make format-check); run: docker exec centos-test bash -c 'cd /root/occlum; info=$(make format-check);

8
.github/workflows/package_repo_setup_and_test.yml vendored
View File

@ -46,7 +46,7 @@ jobs:
cp /root/public.key /root/workspace/occlum-package-repos/debian' cp /root/public.key /root/workspace/occlum-package-repos/debian'
- name: Create centos container - name: Create centos container
run: docker run -itd --name=centos -v $GITHUB_WORKSPACE:/root/workspace occlum/occlum:${{ env.OCCLUM_VERSION }}-centos8.1 run: docker run -itd --name=centos -v $GITHUB_WORKSPACE:/root/workspace occlum/occlum:${{ env.OCCLUM_VERSION }}-centos8.2
- name: Build rpm packages - name: Build rpm packages
run: docker exec centos bash -c "cd /root/workspace/occlum/tools/installer/rpm; make; make musl-gcc" run: docker exec centos bash -c "cd /root/workspace/occlum/tools/installer/rpm; make; make musl-gcc"
@ -112,12 +112,12 @@ jobs:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
steps: steps:
- name: Create clean centos container - name: Create clean centos container
run: docker run -itd --name=centos centos:centos8.1.1911 run: docker run -itd --name=centos centos:centos8.2.2004
- name: Install sgx dependencies - name: Install sgx dependencies
run: docker exec centos bash -c "yum install -y wget yum-utils make jq gdb; cd /root && wget https://download.01.org/intel-sgx/sgx-linux/2.11/distro/centos8.1-server/sgx_rpm_local_repo.tgz; run: docker exec centos bash -c "yum install -y wget yum-utils make jq gdb; cd /root && wget https://download.01.org/intel-sgx/sgx-linux/2.13/distro/centos8.2-server/sgx_rpm_local_repo.tgz;
tar -xvzf sgx_rpm_local_repo.tgz; yum-config-manager --add-repo file:///root/sgx_rpm_local_repo; yum --nogpgcheck install -y libsgx-dcap-ql libsgx-epid libsgx-urts; tar -xvzf sgx_rpm_local_repo.tgz; yum-config-manager --add-repo file:///root/sgx_rpm_local_repo; yum --nogpgcheck install -y libsgx-dcap-ql libsgx-epid libsgx-urts;
yum --nogpgcheck install -y libsgx-quote-ex; rpm -i /root/sgx_rpm_local_repo/libsgx-uae-service-2.11.100.2-1.el8.x86_64.rpm || true" yum --nogpgcheck install -y libsgx-quote-ex; rpm -i /root/sgx_rpm_local_repo/libsgx-uae-service-*.rpm || true"
- name: Install occlum - name: Install occlum
run: | run: |

6
.github/workflows/rune_test.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
runs-on: [self-hosted, SGX1-HW] runs-on: [self-hosted, SGX1-HW]
strategy: strategy:
matrix: matrix:
tag: [ubuntu18.04, centos8.1] tag: [ubuntu18.04, centos8.2]
steps: steps:
- name: Clean before running - name: Clean before running
run: | run: |
@ -74,14 +74,14 @@ jobs:
run: docker exec $rune_test bash -c "docker run -i --rm --runtime=rune -e ENCLAVE_TYPE=intelSgx -e ENCLAVE_RUNTIME_PATH=/opt/occlum/build/lib/libocclum-pal.so -e ENCLAVE_RUNTIME_ARGS=occlum_instance occlum-app" run: docker exec $rune_test bash -c "docker run -i --rm --runtime=rune -e ENCLAVE_TYPE=intelSgx -e ENCLAVE_RUNTIME_PATH=/opt/occlum/build/lib/libocclum-pal.so -e ENCLAVE_RUNTIME_ARGS=occlum_instance occlum-app"
- name: Run occlum-hello pod - name: Run occlum-hello pod
if: ${{ contains(matrix.tag, 'centos8.1') }} if: ${{ contains(matrix.tag, 'centos8.2') }}
run: docker exec $rune_test bash -c "containerd" & run: docker exec $rune_test bash -c "containerd" &
docker exec $rune_test bash -c "cd /root/samples && ./clean.sh; docker exec $rune_test bash -c "cd /root/samples && ./clean.sh;
crictl run --timeout 3s hello.yaml pod.yaml && ./show.sh" crictl run --timeout 3s hello.yaml pod.yaml && ./show.sh"
- name: Run golang-web pod - name: Run golang-web pod
if: ${{ contains(matrix.tag, 'centos8.1') }} if: ${{ contains(matrix.tag, 'centos8.2') }}
run: docker exec $rune_test bash -c "cd /root/samples && ./clean.sh; run: docker exec $rune_test bash -c "cd /root/samples && ./clean.sh;
crictl run --timeout 3s golang.yaml pod.yaml && ./show.sh" crictl run --timeout 3s golang.yaml pod.yaml && ./show.sh"

2
tools/docker/README.md
View File

@ -17,6 +17,6 @@ describe the version of Occlum preinstalled in the Docker image
(e.g., "latest", "0.15.0", and "prerelease") and `<OS_NAME>` is the (e.g., "latest", "0.15.0", and "prerelease") and `<OS_NAME>` is the
name of the OS distribution that the Docker image is based on. name of the OS distribution that the Docker image is based on.
Currently, `<OS_NAME>` must be one of the following values: Currently, `<OS_NAME>` must be one of the following values:
`ubuntu18.04`, `centos7.5` and `centos8.1`. `ubuntu18.04` and `centos8.2`.
The resulting Docker image will have `occlum/occlum:<OCCLUM_LABEL>-<OS_NAME>` as its label. The resulting Docker image will have `occlum/occlum:<OCCLUM_LABEL>-<OS_NAME>` as its label.