Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nginx 1.25 #19

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) .
Expand Down
2 changes: 1 addition & 1 deletion flavors.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading