From 00317df4ca528884c12c51d853e8f2f1098978b2 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Thu, 9 Feb 2023 11:20:12 +0200 Subject: [PATCH 1/4] Upgrade nginx to v1.23.3 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cd56a8..f511903 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM zappi/nginx:1.19.5 as builder +FROM zappi/nginx:1.23.3 as builder USER root @@ -24,9 +24,9 @@ RUN apk add --no-cache \ WORKDIR /usr/src/ # Download nginx source -ARG NGINX_VERSION="1.19.5" +ARG NGINX_VERSION="1.23.3" ARG NGINX_PKG="nginx-${NGINX_VERSION}.tar.gz" -ARG NGINX_SHA="5c0a46afd6c452d4443f6ec0767f4d5c3e7c499e55a60cd6542b35a61eda799c" +ARG NGINX_SHA="75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54" RUN wget "http://nginx.org/download/${NGINX_PKG}" && \ echo "${NGINX_SHA} *${NGINX_PKG}" | sha256sum -c - && \ @@ -48,7 +48,7 @@ RUN cd nginx && \ make modules # Production container starts here -FROM zappi/nginx:1.19.5 +FROM zappi/nginx:1.23.3 # Copy compiled module COPY --from=builder /usr/src/nginx/objs/*_module.so /etc/nginx/modules/ From 3364076d2832837295f3153c40f6c85543737611 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Thu, 9 Feb 2023 11:20:25 +0200 Subject: [PATCH 2/4] Upgrade headers-more to v0.34 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f511903..49587f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,9 @@ RUN wget "http://nginx.org/download/${NGINX_PKG}" && \ tar --no-same-owner -xzf ${NGINX_PKG} --one-top-level=nginx --strip-components=1 # Download headers-more module source -ARG HEADERS_MORE_VERSION="0.33" +ARG HEADERS_MORE_VERSION="0.34" ARG HEADERS_MORE_PKG="v${HEADERS_MORE_VERSION}.tar.gz" -ARG HEADERS_MORE_SHA="a3dcbab117a9c103bc1ea5200fc00a7b7d2af97ff7fd525f16f8ac2632e30fbf" +ARG HEADERS_MORE_SHA="0c0d2ced2ce895b3f45eb2b230cd90508ab2a773299f153de14a43e44c1209b3" RUN wget "https://github.com/openresty/headers-more-nginx-module/archive/${HEADERS_MORE_PKG}" && \ echo "${HEADERS_MORE_SHA} *${HEADERS_MORE_PKG}" | sha256sum -c - && \ From 2849c6680709f0e36badf3c719621a72550b629d Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Thu, 9 Feb 2023 11:20:35 +0200 Subject: [PATCH 3/4] Update codeowners --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 0db5bca..9cd5e24 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @Intellection/devops +* @Intellection/sre From b77beda86afaea7cb940282a3edb1946f9067cce Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Thu, 9 Feb 2023 11:20:46 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5216c2c..84a81e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.23.3 + +* Upgrade nginx to 1.23.3. +* Upgrade headers-more to 0.34. + ## 1.19.5-8 * Allow passing through `X-Forwarded-Host` header if it's set.