From 8e50f146660aa3ce3c4d92ce51164afef429d83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 14:02:23 -0300 Subject: [PATCH 1/6] Add version 1.22.1 of nginx --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b2374f3..285a177 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,10 @@ jobs: - tsuru experimental: - false + include: + - nginx: "1.22.1" + flavor: tsuru + experimental: true steps: - uses: actions/checkout@v3 From 53c69a05697ce25daeb3bb8ddac93d22f8250498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 14:26:30 -0300 Subject: [PATCH 2/6] extract openresty version to matrix --- .github/workflows/ci.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 285a177..bf3f3fe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,15 +8,13 @@ jobs: fail-fast: true matrix: nginx: - - "1.21.4" + - "1.25.4" flavor: - tsuru + openresty_package_version: + - openresty_1.25.3.1-2~bookworm1 experimental: - false - include: - - nginx: "1.22.1" - flavor: tsuru - experimental: true steps: - uses: actions/checkout@v3 @@ -40,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 }} From 07c6a59f9a7a3d7bd5cad5c0ace3b362da02abc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 14:34:12 -0300 Subject: [PATCH 3/6] fix version of openresty --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bf3f3fe..1d78a9d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: flavor: - tsuru openresty_package_version: - - openresty_1.25.3.1-2~bookworm1 + - 1.25.3.1-2~bookworm1 experimental: - false From 6e985256ae4251f3b62f99948d7c68654c430a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 14:40:44 -0300 Subject: [PATCH 4/6] attempt to fix build of module openresty/headers-more-nginx-module --- flavors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flavors.json b/flavors.json index 3934eae..2a16beb 100644 --- a/flavors.json +++ b/flavors.json @@ -7,7 +7,7 @@ "https://github.com/openresty/lua-nginx-module.git:v0.10.21", "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", + "https://github.com/openresty/headers-more-nginx-module.git:nginx-1.25.3", "https://github.com/tsuru/ngx-location-name-module.git:main", "https://github.com/FRiCKLE/ngx_cache_purge.git:pr-45", "https://github.com/wandenberg/nginx-push-stream-module.git", From d4a12db8d01b77402e69cd243c184db048b6dd2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 14:46:00 -0300 Subject: [PATCH 5/6] attempt to fix build of module openresty/lua-nginx-module --- flavors.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flavors.json b/flavors.json index 2a16beb..66605a9 100644 --- a/flavors.json +++ b/flavors.json @@ -4,10 +4,10 @@ "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:nginx-1.25.3", + "https://github.com/openresty/headers-more-nginx-module.git", "https://github.com/tsuru/ngx-location-name-module.git:main", "https://github.com/FRiCKLE/ngx_cache_purge.git:pr-45", "https://github.com/wandenberg/nginx-push-stream-module.git", From b8edf644c8959bd91a26ae8e4986340bd0e99c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wilson=20J=C3=BAnior?= Date: Thu, 14 Mar 2024 16:00:32 -0300 Subject: [PATCH 6/6] include libpcre2 on build --- Dockerfile | 2 +- Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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) .