From 4262e2e6d97ba80c95b56ccf4ba5c8d377dae8c6 Mon Sep 17 00:00:00 2001 From: King'ori Maina Date: Wed, 2 Oct 2024 00:41:28 +0200 Subject: [PATCH 1/2] Upgrade nginx to v1.27.1 --- CHANGELOG.md | 4 ++++ Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 509b942..5070ecb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.27.1 + +* Update base image to `zappi/nginx:1.27.1`. + ## 1.25.4 * Add `X-Request-Start` header set to current time with millisecond precision. diff --git a/Dockerfile b/Dockerfile index 3d43b5e..00d5c4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM zappi/nginx:1.25.4 as builder +FROM zappi/nginx:1.27.1 as builder USER root @@ -16,9 +16,9 @@ RUN apt-get update -y && \ WORKDIR /usr/src/ # Download nginx source -ARG NGINX_VERSION="1.25.4" +ARG NGINX_VERSION="1.27.1" ARG NGINX_PKG="nginx-${NGINX_VERSION}.tar.gz" -ARG NGINX_SHA="760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9" +ARG NGINX_SHA="bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc" 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 @@ -37,7 +37,7 @@ RUN cd nginx && \ make modules # Production container starts here -FROM zappi/nginx:1.25.4 +FROM zappi/nginx:1.27.1 USER root From b0d7c94901c9cee1de2ae6270a1d7a4db8c7c736 Mon Sep 17 00:00:00 2001 From: King'ori Maina Date: Wed, 2 Oct 2024 00:51:50 +0200 Subject: [PATCH 2/2] Address syntax warning on FromAsCasing The 'as' keyword should match the case of the 'from' keyword FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/ --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00d5c4f..8945a82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM zappi/nginx:1.27.1 as builder +FROM zappi/nginx:1.27.1 AS builder USER root