Skip to content
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
58 changes: 44 additions & 14 deletions nginx-mainline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# MAINLINE VERSIONS MUST USE ODD MINOR VERSIONS (e.g., 1.27.x, 1.29.x)
# Must also bump njs at the same time
version: "1.29.8"
epoch: 0 # go/wolfi-rsc/nginx-mainline

Check warning on line 6 in nginx-mainline.yaml

View check run for this annotation

Octo STS 2 / epoch-bot

epoch is unchanged

Make sure you intended to keep the epoch the same. This package will not be rebuilt as a result of this change. Consider adding a trailing comment explaining why: `epoch: N # <reason>`. To skip this check, apply the skip:epoch-bot label to the PR.
# HEY YOU! If you update/bump this package you NEED to go and update the equivilent nginx-otel package
description: HTTP and reverse proxy server (mainline version)
copyright:
Expand Down Expand Up @@ -59,8 +59,8 @@
- name: modules
items:
http_geoip: "10"
http_headers_more_filter: "10"
http_image_filter: "10"
http_perl: "10"
http_xslt_filter: "10"
mail: "10"
stream_geoip: "10"
Expand All @@ -87,6 +87,13 @@
expected-commit: 5eaf45f11e85459b52c18f876e69320df420ae29
destination: nginx-mainline

- uses: git-checkout
with:
repository: https://github.com/openresty/headers-more-nginx-module.git
tag: v0.39
expected-commit: 2b1debde426783b8f42246149d3638644a6347cb
destination: headers-more-src

- name: configure
working-directory: nginx-mainline
runs: |
Expand Down Expand Up @@ -139,7 +146,8 @@
--with-stream_ssl_module \
--with-stream_realip_module \
--with-stream_geoip_module=dynamic \
--with-stream_ssl_preread_module
--with-stream_ssl_preread_module \
--add-dynamic-module=../headers-more-src

- working-directory: nginx-mainline
runs: |
Expand Down Expand Up @@ -377,21 +385,22 @@
rc-service nginx stop

- range: modules
name: nginx-mainline-mod-${{range.key}}
name: ${{package.name}}-mod-${{range.key}}
description: Nginx third-party module ${{range.key}}
dependencies:
provides:
- nginx-mod-${{range.key}}=${{package.full-version}}
runtime:
- merged-usrsbin
- perl-dev
- ${{package.name}}
- wolfi-baselayout
pipeline:
- runs: |
mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
# --modules-path is only used for installing modules, not loading them
mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
install -d -m 755 \
${{targets.subpkgdir}}/usr/lib/nginx/modules \
${{targets.subpkgdir}}/etc/nginx/modules \
${{targets.subpkgdir}}/var/lib/nginx
ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules

mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
Expand All @@ -400,13 +409,6 @@
echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf

case ${{range.key}} in
http_perl)
mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
;;
http_naxsi)
install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
;;
stream)
mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
Expand All @@ -416,6 +418,34 @@
pipeline:
- uses: test/tw/ldd-check

- name: ${{package.name}}-mod-http_perl
description: Nginx third-party module http_perl
dependencies:
provides:
- nginx-mod-http_perl=${{package.full-version}}
runtime:
- merged-usrsbin
- ${{package.name}}
- perl
- wolfi-baselayout
pipeline:
- runs: |
install -d -m 755 \
${{targets.subpkgdir}}/usr/lib/nginx/modules \
${{targets.subpkgdir}}/etc/nginx/modules \
${{targets.subpkgdir}}/var/lib/nginx

ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules

mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/

mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/

echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
test:
pipeline:
- uses: test/tw/ldd-check

- name: nginx-mainline-src
description: Nginx source code
dependencies:
Expand Down
56 changes: 43 additions & 13 deletions nginx-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: nginx-stable
# STABLE VERSIONS MUST USE EVEN MINOR VERSIONS (e.g., 1.26.x, 1.28.x)
version: "1.28.3"
epoch: 0 # go/wolfi-rsc/nginx-stable

Check warning on line 5 in nginx-stable.yaml

View check run for this annotation

Octo STS 2 / epoch-bot

epoch is unchanged

Make sure you intended to keep the epoch the same. This package will not be rebuilt as a result of this change. Consider adding a trailing comment explaining why: `epoch: N # <reason>`. To skip this check, apply the skip:epoch-bot label to the PR.
# HEY YOU! If you update/bump this package you NEED to go and update the equivilent nginx-otel package
description: HTTP and reverse proxy server (stable version)
copyright:
Expand Down Expand Up @@ -55,8 +55,8 @@
- name: modules
items:
http_geoip: "10"
http_headers_more_filter: "10"
http_image_filter: "10"
http_perl: "10"
http_xslt_filter: "10"
mail: "10"
stream_geoip: "10"
Expand Down Expand Up @@ -84,6 +84,13 @@
expected-commit: 9b958b000776c88036cd800c66e7e4ad39e6fd41
destination: nginx-stable

- uses: git-checkout
with:
repository: https://github.com/openresty/headers-more-nginx-module.git
tag: v0.39
expected-commit: 2b1debde426783b8f42246149d3638644a6347cb
destination: headers-more-src

- name: configure
working-directory: nginx-stable
runs: |
Expand Down Expand Up @@ -138,7 +145,8 @@
--with-stream_ssl_module \
--with-stream_realip_module \
--with-stream_geoip_module=dynamic \
--with-stream_ssl_preread_module
--with-stream_ssl_preread_module \
--add-dynamic-module=../headers-more-src

- working-directory: nginx-stable
runs: |
Expand Down Expand Up @@ -351,14 +359,15 @@
- nginx-mod-${{range.key}}=${{package.full-version}}
runtime:
- merged-usrsbin
- perl-dev
- ${{package.name}}
- wolfi-baselayout
pipeline:
- runs: |
mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
# --modules-path is only used for installing modules, not loading them
mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
install -d -m 755 \
${{targets.subpkgdir}}/usr/lib/nginx/modules \
${{targets.subpkgdir}}/etc/nginx/modules \
${{targets.subpkgdir}}/var/lib/nginx
ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules

mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
Expand All @@ -367,13 +376,6 @@
echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf

case ${{range.key}} in
http_perl)
mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
;;
http_naxsi)
install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
;;
stream)
mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
Expand All @@ -383,6 +385,34 @@
pipeline:
- uses: test/tw/ldd-check

- name: ${{package.name}}-mod-http_perl
description: Nginx third-party module http_perl
dependencies:
provides:
- nginx-mod-http_perl=${{package.full-version}}
runtime:
- merged-usrsbin
- ${{package.name}}
- perl
- wolfi-baselayout
pipeline:
- runs: |
install -d -m 755 \
${{targets.subpkgdir}}/usr/lib/nginx/modules \
${{targets.subpkgdir}}/etc/nginx/modules \
${{targets.subpkgdir}}/var/lib/nginx

ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules

mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/

mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/

echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
test:
pipeline:
- uses: test/tw/ldd-check

- name: ${{package.name}}-src
description: Nginx source code
dependencies:
Expand Down