Merge pull request #19 from wpjunior/nginx-1.25

Nginx 1.26.2

Author: wpjunior

.github/workflows/ci.yaml

@@ -8,9 +8,11 @@ jobs:
       fail-fast: true
       matrix:
         nginx:
-        - "1.21.4"
+        - "1.26.2"
         flavor:
         - tsuru
+        openresty_package_version:
+        - 1.27.1.1-1~bookworm1
         experimental:
         - false
 
@@ -36,6 +38,7 @@ jobs:
         cache-to: type=local,dest=/tmp/.buildx-cache
         build-args: |
           nginx_version=${{ matrix.nginx }}
+          openresty_package_version=${{ matrix.openresty_package_version }}
           modules=${{ env.MODULES }}
           lua_modules=${{ env.LUA_MODULES }}
     - run: make test flavor=${{ matrix.flavor }} nginx_version=${{ matrix.nginx }}

Dockerfile

@@ -6,11 +6,11 @@ SHELL ["/bin/bash", "-c"]
 RUN set -x \
     && apt-get update \
     && apt-get install -y --no-install-suggests \
-       libluajit-5.1-dev libpam0g-dev zlib1g-dev libpcre3-dev \
+       libluajit-5.1-dev libpam0g-dev zlib1g-dev libpcre3-dev libpcre2-dev \
        libexpat1-dev git curl build-essential lsb-release libxml2 libxslt1.1 libxslt1-dev autoconf libtool libssl-dev \
        unzip libmaxminddb-dev
 
-ARG openresty_package_version=1.21.4.1-1~bullseye1
+ARG openresty_package_version=1.27.1.1-1~bookworm1
 RUN set -x \
     && curl -fsSL https://openresty.org/package/pubkey.gpg | apt-key add - \
     && echo "deb https://openresty.org/package/$(uname -m | grep -qE 'aarch64|arm64' && echo -n 'arm64/')debian $(lsb_release -sc) openresty" | tee -a /etc/apt/sources.list.d/openresty.list \

Makefile

@@ -1,7 +1,7 @@
 nginx_version ?= stable
 
 DOCKER ?= docker
-DOCKER_BUILD_OPTS ?=
+DOCKER_BUILD_OPTS ?= --platform=linux/amd64
 
 .PHONY: all
 all:
@@ -24,6 +24,7 @@ image: check-required-vars
 	lua_modules=$$(jq -er '.flavors[] | select(.name == "$(flavor)") | [ .lua_modules[]? ] | join(",")' flavors.json) && \
 	$(DOCKER) build $(DOCKER_BUILD_OPTS) \
 		--build-arg nginx_version=$(nginx_version) \
+		--build-arg openresty_package_version=${openresty_package_version} \
 		--build-arg modules="$$modules" \
 		--build-arg lua_modules="$$lua_modules" \
 		-t tsuru/nginx-$(flavor):$(nginx_version) .

flavors.json

@@ -4,7 +4,7 @@
       "name": "tsuru",
       "modules": [
         "https://github.com/simplresty/ngx_devel_kit.git:v0.3.1",
-        "https://github.com/openresty/lua-nginx-module.git:v0.10.21",
+        "https://github.com/openresty/lua-nginx-module.git:v0.10.27",
         "https://github.com/openresty/lua-ssl-nginx-module.git",
         "https://github.com/openresty/echo-nginx-module.git",
         "https://github.com/openresty/headers-more-nginx-module.git",