diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index c757f8b20..c2c957963 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -54,7 +54,7 @@ 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_IPMATCHER_VERSION=1a0a1c58fd085b15eedee58de8b5f45c27aff7bc export LUA_RESTY_GLOBAL_THROTTLE_VERSION=0.2.0 export BUILD_PATH=/tmp/build @@ -219,8 +219,8 @@ 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 d0eacda122ab36585936256cb222ea9147bc5ad1fc3f24fd3748475653dd27ad \ + "https://github.com/api7/lua-resty-ipmatcher/archive/$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" @@ -591,10 +591,7 @@ cd "$BUILD_PATH/lua-resty-redis-$LUA_RESTY_REDIS_VERSION" make install cd "$BUILD_PATH/lua-resty-ipmatcher-$LUA_RESTY_IPMATCHER_VERSION" -# temporal fix for make install - remove line 22 -sed -i '22d' Makefile - -make install +INST_LUADIR=/usr/local/lib/lua make install cd "$BUILD_PATH/lua-resty-global-throttle-$LUA_RESTY_GLOBAL_THROTTLE_VERSION" make install