[demos] Specify protoc-gen-go-grpc version for go pingpong demo
This commit is contained in:
		
							parent
							
								
									ea6e33e6f1
								
							
						
					
					
						commit
						814b573304
					
				@ -54,9 +54,9 @@ fi
 | 
				
			|||||||
if ! type "protoc-gen-go-grpc" > /dev/null 2>&1; then
 | 
					if ! type "protoc-gen-go-grpc" > /dev/null 2>&1; then
 | 
				
			||||||
	if [[ $GOVERSION != 'go1.16.3' ]];then
 | 
						if [[ $GOVERSION != 'go1.16.3' ]];then
 | 
				
			||||||
	occlum-go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
 | 
						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
 | 
						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
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -19,10 +19,7 @@ occlum init
 | 
				
			|||||||
new_json="$(jq '.resource_limits.user_space_size = "1MB" |
 | 
					new_json="$(jq '.resource_limits.user_space_size = "1MB" |
 | 
				
			||||||
	.resource_limits.user_space_max_size = "800MB" |
 | 
						.resource_limits.user_space_max_size = "800MB" |
 | 
				
			||||||
	.resource_limits.kernel_space_heap_size="1MB" |
 | 
						.resource_limits.kernel_space_heap_size="1MB" |
 | 
				
			||||||
	.resource_limits.kernel_space_heap_max_size="40MB" |
 | 
						.resource_limits.kernel_space_heap_max_size="80MB"  ' Occlum.json)" && \
 | 
				
			||||||
	.resource_limits.kernel_space_stack_size="1MB" |
 | 
					 | 
				
			||||||
	.process.default_stack_size = "1MB" |
 | 
					 | 
				
			||||||
	.process.default_heap_size = "20MB" ' Occlum.json)" && \
 | 
					 | 
				
			||||||
echo "${new_json}" > Occlum.json
 | 
					echo "${new_json}" > Occlum.json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 2. Copy program into Occlum Workspace and build
 | 
					# 2. Copy program into Occlum Workspace and build
 | 
				
			||||||
 | 
				
			|||||||
@ -19,10 +19,7 @@ occlum init
 | 
				
			|||||||
new_json="$(jq '.resource_limits.user_space_size = "1MB" |
 | 
					new_json="$(jq '.resource_limits.user_space_size = "1MB" |
 | 
				
			||||||
	.resource_limits.user_space_max_size = "800MB" |
 | 
						.resource_limits.user_space_max_size = "800MB" |
 | 
				
			||||||
	.resource_limits.kernel_space_heap_size="1MB" |
 | 
						.resource_limits.kernel_space_heap_size="1MB" |
 | 
				
			||||||
	.resource_limits.kernel_space_heap_max_size="40MB" |
 | 
						.resource_limits.kernel_space_heap_max_size="80MB" ' Occlum.json)" && \
 | 
				
			||||||
	.resource_limits.kernel_space_stack_size="1MB" |
 | 
					 | 
				
			||||||
	.process.default_stack_size = "1MB" |
 | 
					 | 
				
			||||||
	.process.default_heap_size = "20MB" ' Occlum.json)" && \
 | 
					 | 
				
			||||||
echo "${new_json}" > Occlum.json
 | 
					echo "${new_json}" > Occlum.json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 2. Copy program into Occlum Workspace and build
 | 
					# 2. Copy program into Occlum Workspace and build
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user