From 814b573304a9a2262cbf1f82459a2e5af9dd4d1a Mon Sep 17 00:00:00 2001 From: Qi Zheng Date: Wed, 12 Jun 2024 17:53:18 +0800 Subject: [PATCH] [demos] Specify protoc-gen-go-grpc version for go pingpong demo --- demos/golang/grpc_pingpong/prepare_ping_pong.sh | 4 ++-- demos/golang/grpc_pingpong/run_ping_on_occlum.sh | 5 +---- demos/golang/grpc_pingpong/run_pong_on_occlum.sh | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/demos/golang/grpc_pingpong/prepare_ping_pong.sh b/demos/golang/grpc_pingpong/prepare_ping_pong.sh index ad24d093..a599ef1c 100755 --- a/demos/golang/grpc_pingpong/prepare_ping_pong.sh +++ b/demos/golang/grpc_pingpong/prepare_ping_pong.sh @@ -54,9 +54,9 @@ fi if ! type "protoc-gen-go-grpc" > /dev/null 2>&1; then if [[ $GOVERSION != 'go1.16.3' ]];then occlum-go get google.golang.org/grpc/cmd/protoc-gen-go-grpc - occlum-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc + occlum-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 else - occlum-go get google.golang.org/grpc/cmd/protoc-gen-go-grpc + occlum-go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 fi fi diff --git a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh index 8173a8b8..bb49fd22 100755 --- a/demos/golang/grpc_pingpong/run_ping_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_ping_on_occlum.sh @@ -19,10 +19,7 @@ occlum init new_json="$(jq '.resource_limits.user_space_size = "1MB" | .resource_limits.user_space_max_size = "800MB" | .resource_limits.kernel_space_heap_size="1MB" | - .resource_limits.kernel_space_heap_max_size="40MB" | - .resource_limits.kernel_space_stack_size="1MB" | - .process.default_stack_size = "1MB" | - .process.default_heap_size = "20MB" ' Occlum.json)" && \ + .resource_limits.kernel_space_heap_max_size="80MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build diff --git a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh index 76b447df..eff3a185 100755 --- a/demos/golang/grpc_pingpong/run_pong_on_occlum.sh +++ b/demos/golang/grpc_pingpong/run_pong_on_occlum.sh @@ -19,10 +19,7 @@ occlum init new_json="$(jq '.resource_limits.user_space_size = "1MB" | .resource_limits.user_space_max_size = "800MB" | .resource_limits.kernel_space_heap_size="1MB" | - .resource_limits.kernel_space_heap_max_size="40MB" | - .resource_limits.kernel_space_stack_size="1MB" | - .process.default_stack_size = "1MB" | - .process.default_heap_size = "20MB" ' Occlum.json)" && \ + .resource_limits.kernel_space_heap_max_size="80MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build