Skip to content

nginx-mainline: add brotli module #8771

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.

Sign up for GitHub

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

Closed
vr wants to merge 1 commit into from
Closed

nginx-mainline: add brotli module #8771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion nginx-mainline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ environment:
data:
- name: modules
items:
http_brotli_filter: "10"
http_brotli_static: "10"
http_geoip: "10"
http_image_filter: "10"
http_perl: "10"
Expand All @@ -53,6 +55,17 @@ pipeline:
with:
expected-sha256: 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86
uri: https://nginx.org/download/nginx-${{package.version}}.tar.gz
- uses: git-checkout
with:
repository: https://github.com/google/ngx_brotli.git
branch: master
expected-commit: a71f9312c2deb28875acc7bacfdd5695a111aa53
destination: ngx_brotli
Comment on lines +58 to +63

@rawlingsj rawlingsj Nov 20, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should probably change to be

   - runs: |
        git clone https://github.com/google/ngx_brotli.git
        git checkout a71f9312c2deb28875acc7bacfdd5695a111aa53

Otherwise the next time this build runs the expected commit sha will not match and the build will fail.

Unfortunately we don't have an automated way to handle keeping multiple git-checkout.

@rawlingsj rawlingsj Nov 20, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about it a bit more, a better solution would probably be to create a new ngx_brotli package and add a environment.contents.packages dependency for the new ngx_brotli which can then be used for --add-dynamic-module=./ngx_brotli

@rawlingsj rawlingsj Nov 20, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vr did you want to try that? I'm happy to if you prefer, up to you. This way both nginx-mainline and nginx-ingress can share the same ngx_brotli package.

@vr vr Nov 21, 2023

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm not sure you can build once for both nginx version 🤔

@vr vr Nov 21, 2023

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and i was not able to directly use git without having uses: git-checkout before because git command was not available before

- runs: |
cd ngx_brotli
git checkout a71f9312c2deb28875acc7bacfdd5695a111aa53
git submodule init
git submodule update
- name: configure
runs: |
export LUAJIT_LIB="$(pkgconf --variable=libdir luajit)"
Expand Down Expand Up @@ -105,7 +118,8 @@ pipeline:
--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=./ngx_brotli
- runs: |
make -j$(nproc)
make DESTDIR=${{targets.destdir}} install
Expand Down