From a3f1c2ad3bc20911e47118cd17e39d640b30ce8d Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 29 Dec 2020 13:59:15 -0500 Subject: [PATCH] include lua-resty-ipmatcher and lua-resty-global-throttle inn the base image --- images/nginx/rootfs/build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index bef6cd20a..ae37ee129 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -54,6 +54,8 @@ export LUA_RESTY_UPLOAD_VERSION=0.10 export LUA_RESTY_STRING_VERSION=0.12 export LUA_RESTY_MEMCACHED_VERSION=0.15 export LUA_RESTY_REDIS_VERSION=0.29 +export LUA_RESTY_IPMATCHER_VERSION=0.6 +export LUA_RESTY_GLOBAL_THROTTLE_VERSION=0.2.0 export BUILD_PATH=/tmp/build @@ -216,6 +218,12 @@ get_src 8257e8fbf78eb2cc2cf2fdca2fda3c2e755f7d3222e7d15cc322111a0f720f9c \ get_src 3f602af507aacd1f7aaeddfe7b77627fcde095fe9f115cb9d6ad8de2a52520e1 \ "https://github.com/openresty/lua-resty-redis/archive/v$LUA_RESTY_REDIS_VERSION.tar.gz" +get_src 87b378e5ac0813de0dc7395a5e53a2a72dab16b0cc4a5f02a9aeadc6ea07b418 \ + "https://github.com/api7/lua-resty-ipmatcher/archive/v$LUA_RESTY_IPMATCHER_VERSION.tar.gz" + +get_src 0fb790e394510e73fdba1492e576aaec0b8ee9ef08e3e821ce253a07719cf7ea \ + "https://github.com/ElvinEfendi/lua-resty-global-throttle/archive/v$LUA_RESTY_GLOBAL_THROTTLE_VERSION.tar.gz" + # improve compilation times CORES=$(($(grep -c ^processor /proc/cpuinfo) - 1)) @@ -581,6 +589,12 @@ make install cd "$BUILD_PATH/lua-resty-redis-$LUA_RESTY_REDIS_VERSION" make install +cd "$BUILD_PATH/lua-resty-ipmatcher-$LUA_RESTY_IPMATCHER_VERSION" +make install + +cd "$BUILD_PATH/lua-resty-global-throttle-$LUA_RESTY_GLOBAL_THROTTLE_VERSION" +make install + # mimalloc cd "$BUILD_PATH" git clone --depth=1 -b v1.6.7 https://github.com/microsoft/mimalloc