@@ -22,12 +22,11 @@ ld_opt=${ld_opt:-"-L$zlib_prefix/lib -L$pcre_prefix/lib -L$OPENSSL_PREFIX/lib -W
2222# dependencies for building openresty
2323OPENSSL_VERSION=${OPENSSL_VERSION:- " 3.2.3" }
2424OPENRESTY_VERSION=" 1.25.3.2"
25- ngx_multi_upstream_module_ver=" 1.1.1 "
25+ ngx_multi_upstream_module_ver=" 1.2.0 "
2626mod_dubbo_ver=" 1.0.2"
2727apisix_nginx_module_ver=" 1.16.3"
2828wasm_nginx_module_ver=" 0.7.0"
2929lua_var_nginx_module_ver=" v0.5.3"
30- grpc_client_nginx_module_ver=" v0.4.4"
3130lua_resty_events_ver=" 0.2.0"
3231
3332
@@ -130,13 +129,6 @@ else
130129 lua-var-nginx-module-${lua_var_nginx_module_ver}
131130fi
132131
133- if [ " $repo " == grpc-client-nginx-module ]; then
134- cp -r " $prev_workdir " ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
135- else
136- git clone --depth=1 -b $grpc_client_nginx_module_ver \
137- https://github.com/api7/grpc-client-nginx-module \
138- grpc-client-nginx-module-${grpc_client_nginx_module_ver}
139- fi
140132
141133cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
142134./patch.sh ../openresty-${OPENRESTY_VERSION}
@@ -152,9 +144,6 @@ cd ..
152144
153145luajit_xcflags=${luajit_xcflags:= " -DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" }
154146no_pool_patch=${no_pool_patch:- }
155- # TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
156- # version of grpc-client-nginx-module
157- grpc_engine_path=" -DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX /libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX /libgrpc_engine.so"
158147
159148cd openresty-${OPENRESTY_VERSION} || exit 1
160149
172161
173162
174163./configure --prefix=" $OR_PREFIX " \
175- --with-cc-opt=" -DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $ cc_opt" \
164+ --with-cc-opt=" -DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt " \
176165 --with-ld-opt=" -Wl,-rpath,$OR_PREFIX /wasmtime-c-api/lib $ld_opt " \
177166 $debug_args \
178167 --add-module=../mod_dubbo-${mod_dubbo_ver} \
182171 --add-module=../apisix-nginx-module-${apisix_nginx_module_ver} /src/meta \
183172 --add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
184173 --add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
185- --add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
186174 --add-module=../lua-resty-events-${lua_resty_events_ver} \
187175 --with-poll_module \
188176 --with-pcre-jit \
@@ -234,10 +222,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
234222sudo OPENRESTY_PREFIX=" $OR_PREFIX " make install
235223cd ..
236224
237- cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
238- sudo OPENRESTY_PREFIX=" $OR_PREFIX " make install
239- cd ..
240-
241225# package etcdctl
242226ETCD_ARCH=" amd64"
243227ETCD_VERSION=${ETCD_VERSION:- ' 3.5.4' }
0 commit comments