Skip to content

Commit 8019ff0

Browse files
nginx-mainline, nginx-stable: add brotli dynamic module
Add ngx_brotli as a build-time dependency and emit two new dynamic module subpackages (nginx-{mainline,stable}-mod-http_brotli_filter and -static) via the existing range: modules loop. The ngx_brotli sources are consumed from /usr/src/ngx_brotli (provided by the new ngx_brotli source-only package) rather than fetched inline, matching the pattern used by njs consuming nginx-src-main. This structure lets nginx-mainline, nginx-stable, and downstream consumers (e.g. ingress-nginx-controller) share the same ngx_brotli pin via a single package. Revives #8771, addressing @rawlingsj's review feedback that suggested packaging ngx_brotli separately. Refs: #8771
1 parent 40181c9 commit 8019ff0

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

nginx-mainline.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package:
33
# MAINLINE VERSIONS MUST USE ODD MINOR VERSIONS (e.g., 1.27.x, 1.29.x)
44
# Must also bump njs at the same time
55
version: "1.29.8"
6-
epoch: 1
6+
epoch: 2
77
# HEY YOU! If you update/bump this package you NEED to go and update the equivilent nginx-otel package
88
description: HTTP and reverse proxy server (mainline version)
99
copyright:
@@ -42,6 +42,7 @@ environment:
4242
- libxml2-dev
4343
- libxslt-dev
4444
- luajit-dev
45+
- ngx_brotli
4546
- openssl-hardened-dev
4647
- pcre2-dev
4748
- perl-dev
@@ -58,6 +59,8 @@ var-transforms:
5859
data:
5960
- name: modules
6061
items:
62+
http_brotli_filter: "10"
63+
http_brotli_static: "10"
6164
http_geoip: "10"
6265
http_image_filter: "10"
6366
http_perl: "10"
@@ -139,7 +142,8 @@ pipeline:
139142
--with-stream_ssl_module \
140143
--with-stream_realip_module \
141144
--with-stream_geoip_module=dynamic \
142-
--with-stream_ssl_preread_module
145+
--with-stream_ssl_preread_module \
146+
--add-dynamic-module=/usr/src/ngx_brotli
143147
144148
- working-directory: nginx-mainline
145149
runs: |

nginx-stable.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package:
22
name: nginx-stable
33
# STABLE VERSIONS MUST USE EVEN MINOR VERSIONS (e.g., 1.26.x, 1.28.x)
44
version: "1.28.3"
5-
epoch: 1
5+
epoch: 2
66
# HEY YOU! If you update/bump this package you NEED to go and update the equivilent nginx-otel package
77
description: HTTP and reverse proxy server (stable version)
88
copyright:
@@ -38,6 +38,7 @@ environment:
3838
- libxml2-dev
3939
- libxslt-dev
4040
- luajit-dev
41+
- ngx_brotli
4142
- openssl-hardened-dev
4243
- pcre-dev
4344
- perl-dev
@@ -54,6 +55,8 @@ var-transforms:
5455
data:
5556
- name: modules
5657
items:
58+
http_brotli_filter: "10"
59+
http_brotli_static: "10"
5760
http_geoip: "10"
5861
http_image_filter: "10"
5962
http_perl: "10"
@@ -138,7 +141,8 @@ pipeline:
138141
--with-stream_ssl_module \
139142
--with-stream_realip_module \
140143
--with-stream_geoip_module=dynamic \
141-
--with-stream_ssl_preread_module
144+
--with-stream_ssl_preread_module \
145+
--add-dynamic-module=/usr/src/ngx_brotli
142146
143147
- working-directory: nginx-stable
144148
runs: |

0 commit comments

Comments
 (0)