[INFRA-324] Upgrade nginx to v1.31.3

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.31.3
+
+* Update base image to `zappi/nginx:1.31.3` (Debian Trixie).
+* Upgrade `headers-more-nginx-module` to `v0.40`.
+* Build the `headers-more` module against PCRE2, as Trixie no longer
+  ships the legacy `libpcre3` packages.
+
 ## 1.27.4
 
 * Update base image to `zappi/nginx:1.27.4`.

Dockerfile

@@ -1,4 +1,4 @@
-FROM zappi/nginx:1.27.4 AS builder
+FROM zappi/nginx:1.31.3 AS builder
 
 USER root
 
@@ -7,26 +7,26 @@ RUN apt-get update -y && \
       build-essential \
       ca-certificates \
       # headers-more
-      libpcre3 \
-      libpcre3-dev \
+      libpcre2-8-0 \
+      libpcre2-dev \
       wget \
       zlib1g \
       zlib1g-dev
 
 WORKDIR /usr/src/
 
 # Download nginx source
-ARG NGINX_VERSION="1.27.4"
+ARG NGINX_VERSION="1.31.3"
 ARG NGINX_PKG="nginx-${NGINX_VERSION}.tar.gz"
-ARG NGINX_SHA="294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2"
+ARG NGINX_SHA="a7657c50811c2d92d9895395e8b873ef60398142c4db21eb647811c38f6dd525"
 RUN wget "http://nginx.org/download/${NGINX_PKG}" && \
     echo "${NGINX_SHA} *${NGINX_PKG}" | sha256sum -c - && \
     tar --no-same-owner -xzf ${NGINX_PKG} --one-top-level=nginx --strip-components=1
 
 # Download headers-more module source
-ARG HEADERS_MORE_VERSION="0.38"
+ARG HEADERS_MORE_VERSION="0.40"
 ARG HEADERS_MORE_PKG="v${HEADERS_MORE_VERSION}.tar.gz"
-ARG HEADERS_MORE_SHA="febf7271c0c3de69adbd02c1e98ee43e91a60eeb6b27abfb77b5b206fda5215a"
+ARG HEADERS_MORE_SHA="c14cb5e6c998590c209efbf77bd7637ce2cab02332e4192756a8af5b26ba4284"
 RUN wget "https://github.com/openresty/headers-more-nginx-module/archive/${HEADERS_MORE_PKG}" && \
     echo "${HEADERS_MORE_SHA} *${HEADERS_MORE_PKG}" | sha256sum -c - && \
     tar --no-same-owner -xzf ${HEADERS_MORE_PKG} --one-top-level=headers-more --strip-components=1
@@ -37,7 +37,7 @@ RUN cd nginx && \
     make modules
 
 # Production container starts here
-FROM zappi/nginx:1.27.4
+FROM zappi/nginx:1.31.3
 
 USER root
 
@@ -49,7 +49,7 @@ RUN apt-get update -y && \
         wget && \
     rm -rf /var/lib/apt/lists/* /tmp/* && \
     wget -q -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/keyrings/nginx.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nginx.gpg] http://nginx.org/packages/mainline/debian bookworm nginx" | tee /etc/apt/sources.list.d/nginx.list && \
+    echo "deb [signed-by=/etc/apt/keyrings/nginx.gpg] http://nginx.org/packages/mainline/debian trixie nginx" | tee /etc/apt/sources.list.d/nginx.list && \
     apt-get purge --auto-remove -y \
         ca-certificates \
         gnupg2 \

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 ZappiStore Ltd
+Copyright (c) 2026 Zappi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal