Skip to content

Update some nginx versions, swap to pcre2 #33

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

Merged
TeddiO merged 11 commits into from
Jun 9, 2026
Merged

Update some nginx versions, swap to pcre2 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
949146e
Bump various nginx versions
TeddiO Jun 8, 2026
d7f8f16
Split zlib into own step
TeddiO Jun 8, 2026
741b535
Bump container, add curl
TeddiO Jun 8, 2026
7a87591
Bump to pcre2
TeddiO Jun 8, 2026
337832d
see if it accepts static
TeddiO Jun 8, 2026
d8d4659
randomize UAs
TeddiO Jun 8, 2026
f6f8d86
works locally, lets see if it's playing nicer today
TeddiO Jun 9, 2026
3ac7329
swap to fetching zlib from github
TeddiO Jun 9, 2026
615b688
remove older versions
TeddiO Jun 9, 2026
f990687
Have the dockerfile attempt to work out if / when we suppress the war…
TeddiO Jun 9, 2026
4ec5fc8
restore main
TeddiO Jun 9, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
version: [1.22.1, 1.24.0, 1.26.3, 1.28.1, 1.30.1, 1.31.0]
version: [1.22.1, 1.24.0, 1.26.3, 1.28.3, 1.30.2, 1.31.1]
steps:
- uses: actions/checkout@v6

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
version: [1.22.1, 1.24.0, 1.26.3, 1.28.1, 1.30.1, 1.31.0]
version: [1.22.1, 1.24.0, 1.26.3, 1.28.3, 1.30.2, 1.31.1]
steps:
- uses: actions/checkout@v6

Expand Down
19 changes: 12 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.21 as build
FROM alpine:3.23 AS build

ARG version=1.30.1
ARG version=1.30.2
ARG opensslversion=3.5.6
ARG zlibversion=1.3.2

RUN apk add --no-cache unzip bash gcc make pcre build-base pcre-dev perl-dev linux-headers
RUN apk add --no-cache unzip bash gcc make pcre2 build-base pcre2-dev pcre2-static perl-dev linux-headers curl

RUN wget https://nginx.org/download/nginx-${version}.tar.gz && \
tar -xf nginx-${version}.tar.gz && \
Expand All @@ -14,11 +14,16 @@ RUN wget https://nginx.org/download/nginx-${version}.tar.gz && \
unzip master.zip && \
wget https://github.com/openssl/openssl/releases/download/openssl-${opensslversion}/openssl-${opensslversion}.tar.gz && \
tar -xf openssl-${opensslversion}.tar.gz && \
wget https://www.zlib.net/zlib-${zlibversion}.tar.gz && \
tar -xf zlib-${zlibversion}.tar.gz
wget https://github.com/madler/zlib/releases/download/v${zlibversion}/zlib-${zlibversion}.tar.gz && \
tar -xf zlib-${zlibversion}.tar.gz

WORKDIR /nginx-${version}
RUN ./configure --with-cc-opt="-static -static-libgcc" \

RUN extra_cc_opt=""; \
if [ "$(printf '%s\n' "$version" "1.28.3" | sort -V | head -n1)" = "$version" ] && [ "$version" != "1.28.3" ]; then \
extra_cc_opt="-Wno-error=unterminated-string-initialization"; \
fi; \
./configure --with-cc-opt="-static -static-libgcc ${extra_cc_opt}" \
--with-ld-opt="-static" \
--with-zlib=../zlib-${zlibversion} \
--add-module=/ngx_http_substitutions_filter_module-master \
Expand Down Expand Up @@ -46,7 +51,7 @@ RUN ./configure --with-cc-opt="-static -static-libgcc" \
--with-http_auth_request_module \
--with-http_addition_module \
--with-http_sub_module \
--with-openssl=../openssl-${opensslversion}
--with-openssl=../openssl-${opensslversion}

RUN make install

Expand Down