Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
Jess Frazelle 2020-06-04 19:40:10 -07:00
parent b5e75f65d9
commit 573af5dd58
No known key found for this signature in database
GPG Key ID: 4BB1599E1A3071F2
2 changed files with 11 additions and 3 deletions

View File

@ -145,6 +145,7 @@ projects=(
nginx/nginx nginx/nginx
simplresty/ngx_devel_kit simplresty/ngx_devel_kit
openresty/luajit2 openresty/luajit2
openresty/lua-cjson
openresty/lua-nginx-module openresty/lua-nginx-module
leev/ngx_http_geoip2_module leev/ngx_http_geoip2_module
maxmind/libmaxminddb maxmind/libmaxminddb

View File

@ -15,6 +15,8 @@ ENV LUA_RESTY_CORE_VERSION v0.1.18rc4
ENV LUA_RESTY_LRUCACHE_VERSION v0.10rc1 ENV LUA_RESTY_LRUCACHE_VERSION v0.10rc1
# https://github.com/openresty/luajit2/releases # https://github.com/openresty/luajit2/releases
ENV LUAJIT2_VERSION v2.1.0-beta3 ENV LUAJIT2_VERSION v2.1.0-beta3
# https://github.com/openresty/lua-cjson/releases
ENV LUA_CJSON_VERSION 2.1.0.8rc1
# Tell nginx's build system where to find LuaJIT 2: # Tell nginx's build system where to find LuaJIT 2:
ENV LUAJIT_LIB=/usr/lib/ ENV LUAJIT_LIB=/usr/lib/
@ -88,7 +90,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
libxslt-dev \ libxslt-dev \
gd-dev \ gd-dev \
geoip-dev \ geoip-dev \
luajit-dev \
musl-utils \ musl-utils \
file \ file \
&& git clone --depth 1 --branch "${NGX_DEVEL_KIT_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \ && git clone --depth 1 --branch "${NGX_DEVEL_KIT_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \
@ -97,7 +98,13 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& git clone --depth 1 --branch "${LUAJIT2_VERSION}" https://github.com/openresty/luajit2.git /usr/src/luajit2 \ && git clone --depth 1 --branch "${LUAJIT2_VERSION}" https://github.com/openresty/luajit2.git /usr/src/luajit2 \
&& ( \ && ( \
cd /usr/src/luajit2 \ cd /usr/src/luajit2 \
&& make \ && make DPREFIX=/usr \
&& make install DPREFIX=/usr \
) \
&& git clone --depth 1 --branch "${LUA_CJSON_VERSION}" https://github.com/openresty/lua-cjson.git /usr/src/lua-cjson \
&& ( \
cd /usr/src/lua-cjson \
&& LIBRARY_PATH="${LUAJIT_LIB}:${LIBRARY_PATH}" CPATH="${LUAJIT_INC}:${CPATH}" make \
&& make install \ && make install \
) \ ) \
&& git clone --depth 1 --branch "${LUA_RESTY_CORE_VERSION}" https://github.com/openresty/lua-resty-core.git /usr/src/lua-resty-core \ && git clone --depth 1 --branch "${LUA_RESTY_CORE_VERSION}" https://github.com/openresty/lua-resty-core.git /usr/src/lua-resty-core \