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

Bump version to 0.13.0

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2020-06-13 04:29:50 +00:00
parent 898967554c
commit 9cefcb08b6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -6,6 +6,6 @@ services:
- docker - docker
script: 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; 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' make submodule; SGX_MODE=SIM make; SGX_MODE=SIM make test'

6
README.md
View File

@ -63,7 +63,7 @@ The `occlum run` command starts up an Occlum SGX enclave, which, behind the scen
### Config Occlum ### 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. 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
"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: 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: 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`. 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? ## How to Build Occlum-Compatible Executable Binaries?

2
src/libos/Cargo.lock generated
View File

@ -2,7 +2,7 @@
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]] [[package]]
name = "Occlum" name = "Occlum"
version = "0.12.0" version = "0.13.0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bitvec", "bitvec",

2
src/libos/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "Occlum" name = "Occlum"
version = "0.12.0" version = "0.13.0"
edition = "2018" edition = "2018"
[lib] [lib]