Rename "occlum_context" to "occlum_instance" for demos

README.md

@@ -32,7 +32,7 @@ Note that the Occlum toolchain is not cross-compiling in the traditional sense:
 
 **Step 2. Initialize a directory as the Occlum instance via `occlum init`**
 ```
-$ mkdir occlum_context && cd occlum_context
+$ mkdir occlum_instance && cd occlum_instance
 $ occlum init
 ```
 The `occlum init` command creates the compile-time and run-time state of Occlum in the current working directory. Each Occlum instance directory should be used for a single instance of an application; multiple applications or different instances of a single application should use different Occlum instances.

demos/embedded_mode/.gitignore

@@ -1,2 +1,2 @@
 .occlum
-occlum_context
+occlum_instance

demos/embedded_mode/Makefile

@@ -3,15 +3,15 @@ SGX_MODE ?= HW
 
 .PHONY: all build_src test clean
 
-all: occlum_context
+all: occlum_instance
 
-occlum_context: build_src
+occlum_instance: build_src
-	@mkdir -p occlum_context
+	@mkdir -p occlum_instance
-	@cd occlum_context && \
+	@cd occlum_instance && \
 		occlum init && \
 		cp ../trusted_memcpy_bench/build/trusted_memcpy_bench image/bin/ && \
 		occlum build
-	@cp -r occlum_context/.occlum .occlum
+	@cp -r occlum_instance/.occlum .occlum
 
 build_src:
 	@$(MAKE) --no-print-directory -C trusted_memcpy_bench
@@ -25,4 +25,4 @@ test:
 clean:
 	@$(MAKE) --no-print-directory -C trusted_memcpy_bench clean
 	@$(MAKE) --no-print-directory -C bench_driver clean
-	@rm -rf .occlum occlum_context
+	@rm -rf .occlum occlum_instance

demos/fish/.gitignore

@@ -1,5 +1,5 @@
 ncurses/
 fish-shell/
 busybox/
-occlum-context/
+occlum-instance/
 occlum-test/

demos/fish/run_fish_test.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-rm -rf occlum-context
+rm -rf occlum-instance
-mkdir occlum-context && cd occlum-context
+mkdir occlum-instance && cd occlum-instance
 occlum init
 mkdir -p image/usr/bin
 cp ../Occlum.json .

demos/gdb_support/.gitignore

@@ -1,2 +1,2 @@
 sample
-occlum_context
+occlum_instance

demos/gdb_support/gdb_sample_on_occlum.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-rm -rf occlum_context && mkdir -p occlum_context
+rm -rf occlum_instance && mkdir -p occlum_instance
-cd occlum_context
+cd occlum_instance
 # 1. Initialize a directory as the Occlum instance
 occlum init
 

demos/golang/.gitignore

@@ -1,2 +1,2 @@
-occlum_context/
+occlum_instance/
 web_server

demos/golang/run_golang_on_occlum.sh

@@ -13,8 +13,8 @@ if [ ! -f $web_server ];then
 fi
 
 # 1. Init Occlum Workspace
-rm -rf occlum_context && mkdir occlum_context
+rm -rf occlum_instance && mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 occlum init
 new_json="$(jq '.resource_limits.user_space_size = "380MB" |
                 .process.default_mmap_size = "300MB"' Occlum.json)" && \

demos/grpc/run_client_on_occlum.sh

@@ -12,9 +12,9 @@ then
   exit 1
 fi
 
-rm -rf occlum_context
+rm -rf occlum_instance
-mkdir occlum_context
+mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 
 occlum init
 if [ $? -ne 0 ]

demos/grpc/run_server_on_occlum.sh

@@ -11,9 +11,9 @@ then
   exit 1
 fi
 
-rm -rf occlum_context
+rm -rf occlum_instance
-mkdir occlum_context
+mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 
 occlum init
 if [ $? -ne 0 ]

demos/java/.gitignore

@@ -1,3 +1,3 @@
-occlum_context/
+occlum_instance/
 gs-messaging-stomp-websocket/
 */*.class

demos/java/run_java_on_occlum.sh

@@ -21,8 +21,8 @@ check_file_exist() {
 
 init_workspace() {
     # Init Occlum Workspace
-    rm -rf occlum_context && mkdir occlum_context
+    rm -rf occlum_instance && mkdir occlum_instance
-    cd occlum_context
+    cd occlum_instance
     occlum init
     new_json="$(jq '.resource_limits.user_space_size = "1400MB" |
                 .resource_limits.kernel_space_heap_size="64MB" |

demos/local_attestation/.gitignore

@@ -1,6 +1,6 @@
 bin
 deps
-occlum_context
+occlum_instance
 DiffieHellmanLibrary/*.cpp
 DiffieHellmanLibrary/*.so
 DiffieHellmanLibrary/*.o

demos/local_attestation/Makefile

@@ -10,17 +10,17 @@ occlum_=$(CUR_DIR)/../..
 
 .PHONY: all build_src test clean
 
-all: occlum_context
+all: occlum_instance
 
-occlum_context: build_src
+occlum_instance: build_src
-	@mkdir -p occlum_context
+	@mkdir -p occlum_instance
-	@cd occlum_context && \
+	@cd occlum_instance && \
 		occlum init && \
 		cp $(CUR_DIR)/AppResponder/responder image/bin/ && \
 		cp $(OPENSSL)/libcrypto.so.1.1 image/lib/ && \
 		cp $(CUR_DIR)/DiffieHellmanLibrary/libecdh.so image/lib/ && \
 		occlum build
-	@cp -r occlum_context/.occlum .occlum
+	@cp -r occlum_instance/.occlum .occlum
 
 build_src:
 	@$(MAKE) --no-print-directory -C DiffieHellmanLibrary
@@ -37,4 +37,4 @@ clean:
 	@$(MAKE) --no-print-directory -C AppResponder  clean
 	@$(MAKE) --no-print-directory -C EnclaveInitiator clean
 	@$(MAKE) --no-print-directory -C DiffieHellmanLibrary clean
-	@rm -rf .occlum occlum_context $(BUILD_DIR)
+	@rm -rf .occlum occlum_instance $(BUILD_DIR)

demos/openvino/.gitignore

@@ -1,4 +1,4 @@
 deps/
 openvino_src/
 model/
-occlum_context/
+occlum_instance/

demos/openvino/run_benchmark_on_occlum.sh

@@ -5,9 +5,9 @@ occlum_lib=/usr/local/occlum/x86_64-linux-musl/lib
 set -e
 
 # 1. Init Occlum Workspace
-rm -rf occlum_context
+rm -rf occlum_instance
-mkdir occlum_context
+mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 occlum init
 new_json="$(jq '.resource_limits.user_space_size = "320MB" |
                 .process.default_mmap_size = "256MB"' Occlum.json)" && \

demos/python/.gitignore

@@ -1 +1 @@
-occlum_context/
+occlum_instance/

demos/python/README.md

@@ -38,4 +38,4 @@ Step 4 (in the Occlum container): Run the sample code on Occlum via
 ```
 ./run_python_on_occlum.sh
 ```
-It will process CSV data files and generate a file (`smvlight.dat`) in `./occlum_context`.
+It will process CSV data files and generate a file (`smvlight.dat`) in `./occlum_instance`.

demos/python/run_python_on_occlum.sh

@@ -12,8 +12,8 @@ if [ ! -d $alpine_fs ];then
 fi
 
 # 1. Init Occlum Workspace
-[ -d occlum_context ] || mkdir occlum_context
+[ -d occlum_instance ] || mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 [ -d image ] || occlum init
 
 # 2. Copy files into Occlum Workspace and build

demos/rust/run_rust_demo_on_occlum.sh

@@ -7,7 +7,7 @@ occlum-cargo build
 popd
 
 # initialize occlum workspace
-rm -rf occlum_context && mkdir occlum_context && cd occlum_context
+rm -rf occlum_instance && mkdir occlum_instance && cd occlum_instance
 
 occlum init
 cp ../rust_app/target/x86_64-unknown-linux-musl/debug/rust_app image/bin

demos/sqlite/.gitignore

@@ -1,3 +1,3 @@
 sqlite_src/
-occlum_context/
+occlum_instance/
 sqlite_demo

demos/sqlite/run_sqlite_on_occlum.sh

@@ -19,8 +19,8 @@ if [ ! -e $DEMO ];then
 fi
 
 # 1. Init Occlum Workspace
-rm -rf occlum_context && mkdir occlum_context
+rm -rf occlum_instance && mkdir occlum_instance
-cd occlum_context
+cd occlum_instance
 occlum init
 
 # 2. Copy files into Occlum Workspace and build