diff --git a/apps/openresty/1.27.1.2-0-1-focal/build/Dockerfile b/apps/openresty/1.27.1.2-0-1-focal/build/Dockerfile index 85447f49ad33..ff95287dd11c 100644 --- a/apps/openresty/1.27.1.2-0-1-focal/build/Dockerfile +++ b/apps/openresty/1.27.1.2-0-1-focal/build/Dockerfile @@ -117,6 +117,8 @@ COPY tmp /tmp ARG CONTAINER_PACKAGE_URL RUN sed -i "s|http://archive.ubuntu.com/ubuntu/|${CONTAINER_PACKAGE_URL}|g" /etc/apt/sources.list \ && sed -i "s|http://security.ubuntu.com/ubuntu/|${CONTAINER_PACKAGE_URL}|g" /etc/apt/sources.list + +COPY --from=panel-openresty /usr/local/openresty/modules/ngx_brotli /usr/local/openresty/modules/ngx_brotli RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -216,7 +218,8 @@ RUN bash /tmp/default.sh COPY --from=panel-openresty /usr/local/openresty/1pwaf /usr/local/openresty/1pwaf COPY --from=panel-openresty /usr/local/openresty/1pwaf/libraries/libmaxminddb.so /usr/local/openresty/1pwaf/libraries/libmaxminddb.so COPY --from=panel-openresty /usr/local/openresty/1pwaf/libraries/libinjection.so /usr/local/openresty/1pwaf/libraries/libinjection.so -COPY --from=panel-openresty /usr/local/openresty/luajit/lib/lua/5.1/lsqlite3.so /usr/local/openresty/luajit/lib/lua/5.1/lsqlite3.so +COPY --from=panel-openresty /usr/local/openresty/luajit/lib/lua/5.1/lsqlite3.so /usr/local/openresty/luajit/lib/lua/5.1/lsqlite3.so +COPY --from=panel-openresty /usr/local/openresty/luajit/lib/lua/5.1/lfs.so /usr/local/openresty/luajit/lib/lua/5.1/lfs.so CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"] diff --git a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/default.sh b/apps/openresty/1.27.1.2-0-1-focal/build/tmp/default.sh index 6c16d6796998..2f234db77f38 100644 --- a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/default.sh +++ b/apps/openresty/1.27.1.2-0-1-focal/build/tmp/default.sh @@ -1,5 +1,4 @@ apt-get install -y --no-install-recommends libsqlite3-dev git python3 automake autoconf libtool\ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ - && luarocks install luafilesystem \ && mkdir -p /usr/local/openresty/1pwaf/libraries diff --git a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libinjection-main.zip b/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libinjection-main.zip deleted file mode 100644 index b327b3d430de..000000000000 Binary files a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libinjection-main.zip and /dev/null differ diff --git a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libmaxminddb.zip b/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libmaxminddb.zip deleted file mode 100644 index 6c4f1b212d61..000000000000 Binary files a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/libmaxminddb.zip and /dev/null differ diff --git a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/lsqlite3.zip b/apps/openresty/1.27.1.2-0-1-focal/build/tmp/lsqlite3.zip deleted file mode 100644 index a12b87510358..000000000000 Binary files a/apps/openresty/1.27.1.2-0-1-focal/build/tmp/lsqlite3.zip and /dev/null differ