More proper fix for lua-resty-openssl to install production module.

Author: GUI

Dockerfile

@@ -62,7 +62,7 @@ COPY src/api-umbrella/web-app/package.json src/api-umbrella/web-app/pnpm-lock.ya
 COPY tasks/app-deps/web-app/pnpm /app/tasks/app-deps/web-app/
 RUN make app-deps:web-app:pnpm && make clean:dev
 
-COPY build/patches/lrexlib-pcre2.patch build/patches/lua-resty-openssl.patch /app/build/patches/
+COPY build/patches/lrexlib-pcre2.patch /app/build/patches/
 COPY tasks/app-deps/luarocks /app/tasks/app-deps/
 RUN make app-deps:luarocks && make clean:dev
 

build/patches/lua-resty-openssl.patch

@@ -7,6 +7,9 @@ local xpcall_error_handler = require "api-umbrella.utils.xpcall_error_handler"
 -- Preload modules that pgmoon may require at query() time.
 require "pgmoon.arrays"
 require "pgmoon.json"
+require "resty.openssl"
+require "resty.openssl.auxiliary.nginx"
+require "resty.openssl.auxiliary.nginx_c"
 
 local _encode_bytea = pgmoon.Postgres.encode_bytea
 local _escape_identifier = pgmoon.Postgres.escape_identifier

src/api-umbrella/utils/pg_utils.lua

@@ -17,13 +17,6 @@ extra_args=(
 
 luarocks_install "./api-umbrella-git-1.rockspec" "git-1" "${extra_args[@]}"
 
-# Temporary workaround for lua-resty-openssl and OpenResty 1.27:
-# https://github.com/fffonion/lua-resty-openssl/pull/200
-(
-  cd "${APP_VENDOR_LUA_SHARE_DIR}/resty/openssl"
-  patch -p4 < "$SOURCE_DIR/build/patches/lua-resty-openssl.patch"
-)
-
 # lrexlib-pcre2
 (
   lrexlib_pcre2_version="2.9.2-1"

tasks/app-deps/luarocks

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+lua_resty_openssl_aux_module_version="0.3.0"
+lua_resty_openssl_aux_module_hash="535cda86ca5f326479fb9870288ca8f6ecd94e579374e6686d8fe508872dd4ce"
 ngx_http_geoip2_module_version="3.4"
 ngx_http_geoip2_module_hash="82d4beef48c260c3568eb0ae56451c95"
 openresty_version="1.27.1.1"
@@ -16,6 +18,9 @@ extract_download "openresty-$openresty_version.tar.gz"
 download "https://github.com/leev/ngx_http_geoip2_module/archive/$ngx_http_geoip2_module_version.tar.gz" "md5" "$ngx_http_geoip2_module_hash"
 extract_download "$ngx_http_geoip2_module_version.tar.gz"
 
+download "https://github.com/fffonion/lua-resty-openssl-aux-module/archive/refs/tags/$lua_resty_openssl_aux_module_version.tar.gz" "sha256" "$lua_resty_openssl_aux_module_hash"
+extract_download "$lua_resty_openssl_aux_module_version.tar.gz"
+
 cd "openresty-$openresty_version"
 patch -p1 < "$SOURCE_DIR/build/patches/openresty-cli.patch"
 
@@ -51,6 +56,8 @@ patch -p1 < "$SOURCE_DIR/build/patches/openresty-cli.patch"
   --with-threads \
   --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
   --add-module="../ngx_http_geoip2_module-$ngx_http_geoip2_module_version" \
+  --add-module="../lua-resty-openssl-aux-module-$lua_resty_openssl_aux_module_version" \
+  --add-module="../lua-resty-openssl-aux-module-$lua_resty_openssl_aux_module_version/stream" \
   -j"$NPROC"
 make -j"$NPROC"
 make install DESTDIR="$STAGE_DIR"