diff --git a/.travis.yml b/.travis.yml index 5395a4fb..85c67ce0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ services: - docker script: -- docker run -v /home/travis/build/occlum/occlum:/root/occlum occlum/occlum:0.11.0-ubuntu18.04 /bin/bash -c "cd /root/occlum; make submodule; SGX_MODE=SIM make; SGX_MODE=SIM make test" +- docker run -v /home/travis/build/occlum/occlum:/root/occlum occlum/occlum:0.12.0-ubuntu18.04 /bin/bash -c "cd /root/occlum; make submodule; SGX_MODE=SIM make; SGX_MODE=SIM make test" diff --git a/README.md b/README.md index 96ce866b..196f10fa 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,19 @@ Occlum can be configured easily via a config file named `Occlum.json`, which is } ``` +### Try Experimental Features + +Occlum has added several new experimental commands, which provide a more container-like experience to users, as shown below: +``` +occlum init +occlum build +occlum start +occlum exec +occlum exec +occlum exec +occlum stop +``` + ## How to Use? We have built and tested Occlum on Ubuntu 18.04 with or without hardware SGX support (if the CPU does not support SGX, Occlum can be run in the SGX simulation mode). To give Occlum a quick try, one can use the Occlum Docker image by following the steps below: @@ -135,7 +148,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.11.0-ubuntu18.04 + docker run -it --device /dev/isgx occlum/occlum:0.12.0-ubuntu18.04 ``` Step 4-5 are to be done on the guest OS running inside the Docker container: @@ -222,10 +235,6 @@ Of course, Occlum must be run on Intel x86 CPUs with SGX support to do its magic ## Contributors -The founders of Occlum project are - * Hongliang Tian and Shoumeng Yan at Ant Financial; and - * Youren Shen, Yu Chen, and Kang Chen at Tsinghua University. - This project follows the [all-contributors](https://allcontributors.org) specification. Contributions of any kind are welcome! We will publish contributing guidelines and accept pull requests after the project gets more stable. Thanks go to [all these wonderful contributors to this project](CONTRIBUTORS.md). diff --git a/src/exec/Cargo.lock b/src/exec/Cargo.lock index 53d245b2..221d20bb 100644 --- a/src/exec/Cargo.lock +++ b/src/exec/Cargo.lock @@ -419,7 +419,7 @@ dependencies = [ [[package]] name = "occlum_exec" -version = "0.1.0" +version = "0.12.0" dependencies = [ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/exec/Cargo.toml b/src/exec/Cargo.toml index a9155eac..86f70b95 100644 --- a/src/exec/Cargo.toml +++ b/src/exec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "occlum_exec" -version = "0.1.0" +version = "0.12.0" edition = "2018" [lib] diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock index e0c4f817..cdded3d4 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.11.0" +version = "0.12.0" dependencies = [ "bitflags", "bitvec", diff --git a/src/libos/Cargo.toml b/src/libos/Cargo.toml index 2b7c8370..3fc7382a 100644 --- a/src/libos/Cargo.toml +++ b/src/libos/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "Occlum" -version = "0.11.0" +version = "0.12.0" edition = "2018" [lib]