diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b2374f3..1d78a9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,9 +8,11 @@ jobs: fail-fast: true matrix: nginx: - - "1.21.4" + - "1.25.4" flavor: - tsuru + openresty_package_version: + - 1.25.3.1-2~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 }} diff --git a/Dockerfile b/Dockerfile index a739458..a8ff594 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ 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 diff --git a/Makefile b/Makefile index c667132..021e0aa 100644 --- a/Makefile +++ b/Makefile @@ -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) . diff --git a/flavors.json b/flavors.json index 3934eae..66605a9 100644 --- a/flavors.json +++ b/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.26", "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",