feat(openresty) bundle Kong/lua-resty-events (#460)

This adds [Kong/lua-resty-events](https://github.com/Kong/lua-resty-events) to kong-ngx-build.
Kong · Jun 6, 2022 · 87a36ea · 87a36ea
1 parent acfda16
commit 87a36ea
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ RESTY_PCRE_VERSION ?= `grep RESTY_PCRE_VERSION $(KONG_SOURCE_LOCATION)/.requirem
 KONG_GMP_VERSION ?= `grep KONG_GMP_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 KONG_NETTLE_VERSION ?= `grep KONG_NETTLE_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 KONG_NGINX_MODULE ?= `grep KONG_NGINX_MODULE $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
+RESTY_EVENTS ?= `grep RESTY_EVENTS $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 RESTY_LMDB ?= `grep RESTY_LMDB $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 LIBYAML_VERSION ?= `grep ^LIBYAML_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 RESTY_WEBSOCKET ?= `grep RESTY_WEBSOCKET $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
@@ -187,6 +188,7 @@ else
 	--build-arg KONG_NGINX_MODULE=$(KONG_NGINX_MODULE) \
 	--build-arg RESTY_LMDB=$(RESTY_LMDB) \
 	--build-arg RESTY_WEBSOCKET=$(RESTY_WEBSOCKET) \
+	--build-arg RESTY_EVENTS=$(RESTY_EVENTS) \
 	--build-arg OPENRESTY_PATCHES=$(OPENRESTY_PATCHES) \
 	--build-arg DEBUG=$(DEBUG) \
 	-t $(DOCKER_REPOSITORY):openresty-$(PACKAGE_TYPE)-$(DOCKER_OPENRESTY_SUFFIX) . )

diff --git a/build-openresty.sh b/build-openresty.sh
@@ -49,6 +49,10 @@ then
   RESTY_WEBSOCKET=0
 fi
 
+if [ -z "$RESTY_EVENTS" ]
+then
+  RESTY_EVENTS=0
+fi
 
 LUAROCKS_PREFIX=/usr/local \
 LUAROCKS_DESTDIR=/tmp/build \
@@ -64,6 +68,7 @@ EDITION=$EDITION \
 --openssl $RESTY_OPENSSL_VERSION \
 --resty-lmdb $RESTY_LMDB \
 --resty-websocket $RESTY_WEBSOCKET \
+--resty-events $RESTY_EVENTS \
 --luarocks $RESTY_LUAROCKS_VERSION \
 --kong-nginx-module $KONG_NGINX_MODULE \
 --pcre $RESTY_PCRE_VERSION \

diff --git a/dockerfiles/Dockerfile.openresty b/dockerfiles/Dockerfile.openresty
@@ -46,6 +46,9 @@ LABEL resty_lmdb="${RESTY_LMDB}"
 ARG RESTY_WEBSOCKET=0
 LABEL resty_websocket="${RESTY_WEBSOCKET}"
 
+ARG RESTY_EVENTS=0
+LABEL resty_events="${RESTY_EVENTS}"
+
 COPY openresty-build-tools /tmp/openresty-build-tools
 COPY openresty-patches /tmp/openresty-patches
 COPY build-openresty.sh /tmp/build-openresty.sh

diff --git a/openresty-build-tools/kong-ngx-build b/openresty-build-tools/kong-ngx-build
@@ -16,6 +16,7 @@ OPENRESTY_PATCHES=$OPENRESTY_PATCHES
 KONG_NGINX_MODULE=master
 RESTY_LMDB=master
 RESTY_WEBSOCKET=${RESTY_WEBSOCKET:-0}
+RESTY_EVENTS=main
 DEBUG=0
 NPROC=
 OS=
@@ -101,6 +102,10 @@ main() {
         RESTY_WEBSOCKET=$2
         shift 1
         ;;
+      --resty-events)
+        RESTY_EVENTS=$2
+        shift 2
+        ;;
       -f|--force)
         FORCE=1
         shift 1
@@ -390,6 +395,25 @@ main() {
         popd
       popd
     fi
+
+    # lua-resty-events
+    if [ $RESTY_EVENTS != 0 ]; then
+      if [[ $RESTY_EVENTS == "main" ]]; then
+        RESTY_EVENTS="origin/main"
+      fi
+      pushd $DOWNLOAD_CACHE
+        if [ ! -d lua-resty-events ]; then
+          warn "lua-resty-events source not found, cloning..."
+          git clone https://github.com/Kong/lua-resty-events --recursive
+        fi
+
+        pushd lua-resty-events
+          git fetch
+          # Accept both tags, branches and SHAs
+          git reset --hard $RESTY_EVENTS || git reset --hard origin/$RESTY_EVENTS
+        popd
+      popd
+    fi
   popd
 
   if [ ! -z "$DOWNLOAD_ONLY" ]; then
@@ -622,6 +646,10 @@ main() {
           OPENRESTY_OPTS+=("--add-module=$DOWNLOAD_CACHE/lua-resty-lmdb")
         fi
 
+        if [ $RESTY_EVENTS != 0 ]; then
+          OPENRESTY_OPTS+=("--add-module=$DOWNLOAD_CACHE/lua-resty-events")
+        fi
+
         if version_gte $NGINX_CORE_VER 1.11.4; then
           OPENRESTY_OPTS+=('--with-stream_realip_module')
         fi
@@ -686,6 +714,13 @@ main() {
           make install LUA_LIB_DIR=$OPENRESTY_INSTALL/lualib
         popd
       fi
+
+      if [ $RESTY_EVENTS != 0 ]; then
+        pushd $DOWNLOAD_CACHE/lua-resty-events
+          warn "installing library files for lua-resty-events..."
+          make install LUA_LIB_DIR=$OPENRESTY_INSTALL/lualib
+        popd
+      fi
     popd
 
     succ "OpenResty $OPENRESTY_VER has been built successfully!"