Automated updates

fabiocicerchia · May 17, 2022 · be0d38c · be0d38c
1 parent b2f96f0
commit be0d38c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/nginx/1.21.6/almalinux/8.6-20220512/Dockerfile b/nginx/1.21.6/almalinux/8.6-20220512/Dockerfile
@@ -40,6 +40,7 @@ ENV VER_NGX_DEVEL_KIT=$VER_NGX_DEVEL_KIT
 
 # luajit2
 # https://github.com/openresty/luajit2/tags
+# Note: LuaJIT2 is stuck on Lua 5.1 since 2009.
 ARG VER_LUAJIT=2.1-20220310
 ENV VER_LUAJIT=$VER_LUAJIT
 ARG LUAJIT_LIB=/usr/local/lib
@@ -60,7 +61,7 @@ ENV VER_LUA_NGINX_MODULE=$VER_LUA_NGINX_MODULE
 # This library is production ready.
 ARG VER_LUA_RESTY_CORE=0.1.22
 ENV VER_LUA_RESTY_CORE=$VER_LUA_RESTY_CORE
-ARG LUA_LIB_DIR=/usr/local/share/lua/5.1
+ARG LUA_LIB_DIR=/usr/local/share/lua/5.4
 ENV LUA_LIB_DIR=$LUA_LIB_DIR
 
 # lua-resty-lrucache

diff --git a/nginx/1.21.6/almalinux/8.6-20220512/Dockerfile-compat b/nginx/1.21.6/almalinux/8.6-20220512/Dockerfile-compat
@@ -40,6 +40,7 @@ ENV VER_NGX_DEVEL_KIT=$VER_NGX_DEVEL_KIT
 
 # luajit2
 # https://github.com/openresty/luajit2/tags
+# Note: LuaJIT2 is stuck on Lua 5.1 since 2009.
 ARG VER_LUAJIT=2.1-20220310
 ENV VER_LUAJIT=$VER_LUAJIT
 ARG LUAJIT_LIB=/usr/local/lib
@@ -61,7 +62,7 @@ ENV VER_LUA_NGINX_MODULE=$VER_LUA_NGINX_MODULE
 # This library is production ready.
 ARG VER_LUA_RESTY_CORE=0.1.22
 ENV VER_LUA_RESTY_CORE=$VER_LUA_RESTY_CORE
-ARG LUA_LIB_DIR=/usr/local/share/lua/5.1
+ARG LUA_LIB_DIR=/usr/local/share/lua/5.4
 ENV LUA_LIB_DIR=$LUA_LIB_DIR
 
 # lua-resty-lrucache

diff --git a/nginx/1.21.6/almalinux/8.6-20220512/tpl/Makefile b/nginx/1.21.6/almalinux/8.6-20220512/tpl/Makefile
@@ -58,7 +58,16 @@ dep-ngx_devel_kit:
 
 # OpenResty LUAJIT2
 # ##############################################################################
-dep-luajit:
+# This is because OpenResty LuaJIT2 is stuck on Lua 5.1 since 2009.
+# Also, since LUA_LIB_DIR is set on 5.4, the 5.1 folder is always empty and nginx
+# will try to look things in the wrong one, unless provided with:
+#  lua_package_path '/usr/local/share/lua/5.4/?.lua;;';
+#  lua_package_cpath '/usr/local/lib/lua/5.4/?.so;;';
+.workaround-luajit:
+	ln -s /usr/local/lib/lua/5.4 /usr/local/lib/lua/5.1
+	ln -s /usr/local/share/lua/5.4 /usr/local/share/lua/5.1
+
+dep-luajit: .workaround-luajit
 	curl -sLo /luajit.tar.gz https://github.com/openresty/luajit2/archive/v${VER_LUAJIT}.tar.gz
 	tar -C / -xvzf /luajit.tar.gz
 	cd /luajit2-${VER_LUAJIT} \
@@ -166,8 +175,8 @@ dep-lua-openresty-signal:
 	cd /lua-resty-signal-${VER_OPENRESTY_SIGNAL} \
 	&& make \
 	&& make install \
-	&& install -d /usr/local/lib/lua/5.1 \
-	&& install /usr/local/share/lua/5.1/librestysignal.so /usr/local/lib/lua/5.1/librestysignal.so
+	&& install -d /usr/local/lib/lua/5.4 \
+	&& install /usr/local/share/lua/5.4/librestysignal.so /usr/local/lib/lua/5.4/librestysignal.so
 
 # OpenResty Upstream Healthcheck
 # ##############################################################################

diff --git a/nginx/1.21.6/fedora/36/Dockerfile b/nginx/1.21.6/fedora/36/Dockerfile
@@ -40,6 +40,7 @@ ENV VER_NGX_DEVEL_KIT=$VER_NGX_DEVEL_KIT
 
 # luajit2
 # https://github.com/openresty/luajit2/tags
+# Note: LuaJIT2 is stuck on Lua 5.1 since 2009.
 ARG VER_LUAJIT=2.1-20220310
 ENV VER_LUAJIT=$VER_LUAJIT
 ARG LUAJIT_LIB=/usr/local/lib
@@ -60,7 +61,7 @@ ENV VER_LUA_NGINX_MODULE=$VER_LUA_NGINX_MODULE
 # This library is production ready.
 ARG VER_LUA_RESTY_CORE=0.1.22
 ENV VER_LUA_RESTY_CORE=$VER_LUA_RESTY_CORE
-ARG LUA_LIB_DIR=/usr/local/share/lua/5.1
+ARG LUA_LIB_DIR=/usr/local/share/lua/5.4
 ENV LUA_LIB_DIR=$LUA_LIB_DIR
 
 # lua-resty-lrucache

diff --git a/nginx/1.21.6/fedora/36/Dockerfile-compat b/nginx/1.21.6/fedora/36/Dockerfile-compat
@@ -40,6 +40,7 @@ ENV VER_NGX_DEVEL_KIT=$VER_NGX_DEVEL_KIT
 
 # luajit2
 # https://github.com/openresty/luajit2/tags
+# Note: LuaJIT2 is stuck on Lua 5.1 since 2009.
 ARG VER_LUAJIT=2.1-20220310
 ENV VER_LUAJIT=$VER_LUAJIT
 ARG LUAJIT_LIB=/usr/local/lib
@@ -61,7 +62,7 @@ ENV VER_LUA_NGINX_MODULE=$VER_LUA_NGINX_MODULE
 # This library is production ready.
 ARG VER_LUA_RESTY_CORE=0.1.22
 ENV VER_LUA_RESTY_CORE=$VER_LUA_RESTY_CORE
-ARG LUA_LIB_DIR=/usr/local/share/lua/5.1
+ARG LUA_LIB_DIR=/usr/local/share/lua/5.4
 ENV LUA_LIB_DIR=$LUA_LIB_DIR
 
 # lua-resty-lrucache

diff --git a/nginx/1.21.6/fedora/36/tpl/Makefile b/nginx/1.21.6/fedora/36/tpl/Makefile
@@ -58,7 +58,16 @@ dep-ngx_devel_kit:
 
 # OpenResty LUAJIT2
 # ##############################################################################
-dep-luajit:
+# This is because OpenResty LuaJIT2 is stuck on Lua 5.1 since 2009.
+# Also, since LUA_LIB_DIR is set on 5.4, the 5.1 folder is always empty and nginx
+# will try to look things in the wrong one, unless provided with:
+#  lua_package_path '/usr/local/share/lua/5.4/?.lua;;';
+#  lua_package_cpath '/usr/local/lib/lua/5.4/?.so;;';
+.workaround-luajit:
+	ln -s /usr/local/lib/lua/5.4 /usr/local/lib/lua/5.1
+	ln -s /usr/local/share/lua/5.4 /usr/local/share/lua/5.1
+
+dep-luajit: .workaround-luajit
 	curl -sLo /luajit.tar.gz https://github.com/openresty/luajit2/archive/v${VER_LUAJIT}.tar.gz
 	tar -C / -xvzf /luajit.tar.gz
 	cd /luajit2-${VER_LUAJIT} \
@@ -166,8 +175,8 @@ dep-lua-openresty-signal:
 	cd /lua-resty-signal-${VER_OPENRESTY_SIGNAL} \
 	&& make \
 	&& make install \
-	&& install -d /usr/local/lib/lua/5.1 \
-	&& install /usr/local/share/lua/5.1/librestysignal.so /usr/local/lib/lua/5.1/librestysignal.so
+	&& install -d /usr/local/lib/lua/5.4 \
+	&& install /usr/local/share/lua/5.4/librestysignal.so /usr/local/lib/lua/5.4/librestysignal.so
 
 # OpenResty Upstream Healthcheck
 # ##############################################################################