Add RPC Loader to the docker builds.

Author: viferga

docker-compose.yml

@@ -30,7 +30,7 @@ services:
         METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
         METACALL_PATH: $METACALL_PATH
         METACALL_TOOLS_PATH: $METACALL_PATH/tools
-        METACALL_INSTALL_OPTIONS: root base python ruby netcore2 nodejs typescript file rapidjson funchook swig pack # v8rep51 coverage
+        METACALL_INSTALL_OPTIONS: root base python ruby netcore2 nodejs typescript file rpc rapidjson funchook swig pack # v8rep51 coverage
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
@@ -45,7 +45,7 @@ services:
       args:
         METACALL_PATH: $METACALL_PATH
         METACALL_BUILD_TYPE: $METACALL_BUILD_TYPE
-        METACALL_BUILD_OPTIONS: root python ruby netcore2 nodejs typescript file examples distributable tests benchmarks scripts ports dynamic install pack # v8 coverage
+        METACALL_BUILD_OPTIONS: root python ruby netcore2 nodejs typescript file rpc examples distributable tests benchmarks scripts ports dynamic install pack # v8 coverage
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0
@@ -68,7 +68,7 @@ services:
       args:
         METACALL_PATH: $METACALL_PATH
         METACALL_BASE_IMAGE: $METACALL_BASE_IMAGE
-        METACALL_RUNTIME_OPTIONS: root base python ruby netcore2 nodejs typescript file ports clean # v8
+        METACALL_RUNTIME_OPTIONS: root base python ruby netcore2 nodejs typescript file rpc ports clean # v8
     environment:
       DEBIAN_FRONTEND: noninteractive
       LTTNG_UST_REGISTER_TIMEOUT: 0

tools/dev/hooks/env

@@ -23,7 +23,7 @@
 source ../../hooks/env
 
 # Core arguments
-METACALL_BUILD_OPTIONS="root python ruby netcore2 nodejs file examples distributable tests scripts ports dynamic install" # v8 pack and coverage not needed in DockerHub
+METACALL_BUILD_OPTIONS="root python ruby netcore2 nodejs typescript file rpc examples distributable tests scripts ports dynamic install" # v8 pack and coverage not needed in DockerHub
 
 # Core environment variables
 DEBIAN_FRONTEND=noninteractive

tools/metacall-clear.sh

@@ -33,6 +33,7 @@ CLEAR_V8=0
 CLEAR_NODEJS=0
 CLEAR_TYPESCRIPT=0
 CLEAR_FILE=0
+CLEAR_RPC=0
 CLEAR_SWIG=0
 CLEAR_PACK=0
 CLEAR_COVERAGE=0
@@ -102,6 +103,11 @@ sub_file(){
 	echo "clean file"
 }
 
+# RPC
+sub_rpc(){
+	echo "clean rpc"
+}
+
 # SWIG
 sub_swig(){
 	echo "clean swig"
@@ -166,6 +172,9 @@ sub_clear(){
 	if [ $CLEAR_FILE = 1 ]; then
 		sub_file
 	fi
+	if [ $CLEAR_RPC = 1 ]; then
+		sub_rpc
+	fi
 	if [ $CLEAR_SWIG = 1 ]; then
 		sub_swig
 	fi
@@ -237,6 +246,10 @@ sub_options(){
 			echo "file selected"
 			CLEAR_FILE=1
 		fi
+		if [ "$var" = 'rpc' ]; then
+			echo "rpc selected"
+			CLEAR_RPC=1
+		fi
 		if [ "$var" = 'swig' ]; then
 			echo "swig selected"
 			CLEAR_SWIG=1
@@ -267,6 +280,7 @@ sub_help() {
 	echo "	nodejs"
 	echo "	typescript"
 	echo "	file"
+	echo "	rpc"
 	echo "	swig"
 	echo "	pack"
 	echo "	coverage"

tools/metacall-configure.sh

@@ -30,6 +30,7 @@ BUILD_V8=0
 BUILD_NODEJS=0
 BUILD_TYPESCRIPT=0
 BUILD_FILE=0
+BUILD_RPC=0
 BUILD_SCRIPTS=0
 BUILD_EXAMPLES=0
 BUILD_DISTRIBUTABLE=0
@@ -90,6 +91,10 @@ sub_options() {
 			echo "Build with file support"
 			BUILD_FILE=1
 		fi
+		if [ "$option" = 'rpc' ]; then
+			echo "Build with rpc support"
+			BUILD_RPC=1
+		fi
 		if [ "$option" = 'scripts' ]; then
 			echo "Build all scripts"
 			BUILD_SCRIPTS=1
@@ -239,6 +244,15 @@ sub_configure() {
 		fi
 	fi
 
+	# RPC
+	if [ $BUILD_RPC = 1 ]; then
+		BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_LOADERS_RPC=On"
+
+		if [ $BUILD_SCRIPTS = 1 ]; then
+			BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_SCRIPTS_RPC=On"
+		fi
+	fi
+
 	# Examples
 	if [ $BUILD_EXAMPLES = 1 ]; then
 		BUILD_STRING="$BUILD_STRING -DOPTION_BUILD_EXAMPLES=On"
@@ -301,6 +315,7 @@ sub_help() {
 	echo "	nodejs: build with nodejs support"
 	echo "	typescript: build with typescript support"
 	echo "	file: build with file support"
+	echo "	rpc: build with rpc support"
 	echo "	scripts: build all scripts"
 	echo "	examples: build all examples"
 	echo "	distributable: build distributable libraries"

tools/metacall-environment.sh

@@ -42,6 +42,7 @@ INSTALL_V8REPO51=0
 INSTALL_NODEJS=0
 INSTALL_TYPESCRIPT=0
 INSTALL_FILE=0
+INSTALL_RPC=0
 INSTALL_WASM=0
 INSTALL_SWIG=0
 INSTALL_METACALL=0
@@ -282,6 +283,15 @@ sub_file(){
 	echo "configure file"
 }
 
+# RPC
+sub_rpc(){
+	echo "cofingure rpc"
+	cd $ROOT_DIR
+
+	# Install development files and documentation for libcurl (OpenSSL flavour)
+	$SUDO_CMD apt-get $APT_CACHE_CMD -y --no-install-recommends install libcurl4-openssl-dev
+}
+
 # WebAssembly
 sub_wasm(){
 	echo "configure webassembly"
@@ -375,6 +385,9 @@ sub_install(){
 	if [ $INSTALL_FILE = 1 ]; then
 		sub_file
 	fi
+	if [ $INSTALL_RPC = 1 ]; then
+		sub_rpc
+	fi
 	if [ $INSTALL_WASM = 1 ]; then
 		sub_wasm
 	fi
@@ -471,6 +484,10 @@ sub_options(){
 			echo "file selected"
 			INSTALL_FILE=1
 		fi
+		if [ "$var" = 'rpc' ]; then
+			echo "rpc selected"
+			INSTALL_RPC=1
+		fi
 		if [ "$var" = 'wasm' ]; then
 			echo "wasm selected"
 			INSTALL_WASM=1
@@ -515,6 +532,7 @@ sub_help() {
 	echo "	nodejs"
 	echo "	typescript"
 	echo "	file"
+	echo "	rpc"
 	echo "	wasm"
 	echo "	swig"
 	echo "	metacall"

tools/metacall-runtime.sh

@@ -32,6 +32,7 @@ INSTALL_V8=0
 INSTALL_NODEJS=0
 INSTALL_TYPESCRIPT=0
 INSTALL_FILE=0
+INSTALL_RPC=0
 INSTALL_PORTS=0
 INSTALL_CLEAN=0
 SHOW_HELP=0
@@ -143,6 +144,13 @@ sub_file(){
 	# Nothing needed
 }
 
+# RPC
+sub_rpc(){
+	echo "configure rpc"
+
+	sub_apt_install_hold libcurl4
+}
+
 # Ports
 sub_ports(){
 	echo "configure ports"
@@ -182,6 +190,9 @@ sub_install(){
 	if [ $INSTALL_FILE = 1 ]; then
 		sub_file
 	fi
+	if [ $INSTALL_RPC = 1 ]; then
+		sub_rpc
+	fi
 	if [ $INSTALL_PORTS = 1 ]; then
 		sub_ports
 	fi
@@ -244,6 +255,10 @@ sub_options(){
 			echo "file selected"
 			INSTALL_FILE=1
 		fi
+		if [ "$var" = 'rpc' ]; then
+			echo "rpc selected"
+			INSTALL_RPC=1
+		fi
 		if [ "$var" = 'ports' ]; then
 			echo "ports selected"
 			INSTALL_PORTS=1
@@ -269,6 +284,7 @@ sub_help() {
 	echo "	nodejs"
 	echo "	typescript"
 	echo "	file"
+	echo "	rpc"
 	echo "	ports"
 	echo "	clean"
 	echo ""