From 9cefcb08b638dbeaa11d843facb8a1d5367a8455 Mon Sep 17 00:00:00 2001 From: "Tate, Hongliang Tian" Date: Sat, 13 Jun 2020 04:29:50 +0000 Subject: [PATCH] Bump version to 0.13.0 --- .travis.yml | 2 +- README.md | 6 +++--- src/libos/Cargo.lock | 2 +- src/libos/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b93c351..cc325206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ services: - docker script: -- docker run -v /home/travis/build/occlum/occlum:/root/occlum occlum/occlum:0.12.2-ubuntu18.04 /bin/bash -c 'cd /root/occlum; +- docker run -v /home/travis/build/occlum/occlum:/root/occlum occlum/occlum:0.13.0-ubuntu18.04 /bin/bash -c 'cd /root/occlum; info=$(make format-check); if [ -n "$info" ]; then echo "Format error detected."; exit 1; fi; make submodule; SGX_MODE=SIM make; SGX_MODE=SIM make test' diff --git a/README.md b/README.md index c7795a60..e345a8e8 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ The `occlum run` command starts up an Occlum SGX enclave, which, behind the scen ### Config Occlum Occlum can be configured easily via a config file named `Occlum.json`, which is generated by the `occlum init` command in the Occlum context directory. The user can modify `Occlum.json` to config Occlum. A sample of `Occlum.json` is shown below. Some comments are added to provide a brief explanation. -``` +```js { // Resource limits "resource_limits": { @@ -175,7 +175,7 @@ Step 1-3 are to be done on the host OS (Linux): 3. Run the Occlum Docker container, which has Occlum and its demos preinstalled: ``` - docker run -it --device /dev/isgx occlum/occlum:0.12.2-ubuntu18.04 + docker run -it --device /dev/isgx occlum/occlum:0.13.0-ubuntu18.04 ``` Step 4-5 are to be done on the guest OS running inside the Docker container: @@ -216,7 +216,7 @@ To build Occlum from the latest source code, do the following steps in an Occlum ``` which will install the `occlum` command-line tool and other files at `/opt/occlum`. -The Occlum Dockerfile can be found at [here](tools/docker/Dockerfile). Use it to build the container directly or read it to see the dependencies of Occlum. +The Occlum Dockerfile can be found at [here](tools/docker/). Use it to build the container directly or read it to see the dependencies of Occlum. ## How to Build Occlum-Compatible Executable Binaries? diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock index cdded3d4..e956665c 100644 --- a/src/libos/Cargo.lock +++ b/src/libos/Cargo.lock @@ -2,7 +2,7 @@ # It is not intended for manual editing. [[package]] name = "Occlum" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bitflags", "bitvec", diff --git a/src/libos/Cargo.toml b/src/libos/Cargo.toml index 7f770d72..eb99413c 100644 --- a/src/libos/Cargo.toml +++ b/src/libos/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "Occlum" -version = "0.12.0" +version = "0.13.0" edition = "2018" [lib]