Skip to content

Commit 44de6b2

Browse files
authored
chore: optimize script process (#360)
1 parent 055f1e6 commit 44de6b2

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

build-apisix-runtime.sh

+5-14
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ install_openssl_3(){
3838
fi
3939
# required for openssl 3.x config
4040
cpanm IPC/Cmd.pm
41-
wget --no-check-certificate https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
41+
wget --no-check-certificate https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
4242
tar xvf openssl-${OPENSSL_VERSION}.tar.gz
4343
cd openssl-${OPENSSL_VERSION}/
4444
export LDFLAGS="-Wl,-rpath,$zlib_prefix/lib:$OPENSSL_PREFIX/lib"
@@ -53,19 +53,19 @@ install_openssl_3(){
5353
--with-zlib-lib=$zlib_prefix/lib \
5454
--with-zlib-include=$zlib_prefix/include
5555
make -j $(nproc) LD_LIBRARY_PATH= CC="gcc"
56-
make install
56+
sudo make install
5757
if [ -f "$OPENSSL_CONF_PATH" ]; then
58-
cp "$OPENSSL_CONF_PATH" "$OPENSSL_PREFIX"/ssl/openssl.cnf
58+
sudo cp "$OPENSSL_CONF_PATH" "$OPENSSL_PREFIX"/ssl/openssl.cnf
5959
fi
6060
if [ "$ENABLE_FIPS" == "true" ]; then
6161
$OPENSSL_PREFIX/bin/openssl fipsinstall -out $OPENSSL_PREFIX/ssl/fipsmodule.cnf -module $OPENSSL_PREFIX/lib/ossl-modules/fips.so
62-
sed -i 's@# .include [email protected] '"$OPENSSL_PREFIX"'/ssl/fipsmodule.cnf@g; s/# \(fips = fips_sect\)/\1\nbase = base_sect\n\n[base_sect]\nactivate=1\n/g' $OPENSSL_PREFIX/ssl/openssl.cnf
62+
sudo sed -i 's@# .include [email protected] '"$OPENSSL_PREFIX"'/ssl/fipsmodule.cnf@g; s/# \(fips = fips_sect\)/\1\nbase = base_sect\n\n[base_sect]\nactivate=1\n/g' $OPENSSL_PREFIX/ssl/openssl.cnf
6363
fi
6464
cd ..
6565
}
6666

6767

68-
if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
68+
if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$runtime_version" == "0.0.0" ]; then
6969
debug_args="--with-debug"
7070
fi
7171

@@ -157,15 +157,6 @@ grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_
157157

158158
cd openresty-${OPENRESTY_VERSION} || exit 1
159159

160-
if [[ "$OPENRESTY_VERSION" == 1.21.4.1 ]] || [[ "$OPENRESTY_VERSION" == 1.19.* ]]; then
161-
# FIXME: remove this once 1.21.4.2 is released
162-
rm -rf bundle/LuaJIT-2.1-20220411
163-
lj_ver=2.1-20230119
164-
wget "https://github.com/openresty/luajit2/archive/v$lj_ver.tar.gz" -O "LuaJIT-$lj_ver.tar.gz"
165-
tar -xzf LuaJIT-$lj_ver.tar.gz
166-
mv luajit2-* bundle/LuaJIT-2.1-20220411
167-
fi
168-
169160
or_limit_ver=0.08
170161
if [ ! -d "bundle/lua-resty-limit-traffic-$or_limit_ver" ]; then
171162
echo "ERROR: the official repository of lua-resty-limit-traffic has been updated, please sync to API7's repository." >&2

0 commit comments

Comments
 (0)