From 39863c1789fb899955f113bd1167f468f408445b Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Mon, 31 Mar 2025 11:24:58 +0200 Subject: [PATCH 1/4] Upgrade nginx to v1.27.4 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4374ce2..26b111e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM zappi/nginx:1.27.1 AS builder +FROM zappi/nginx:1.27.4 AS builder USER root @@ -16,9 +16,9 @@ RUN apt-get update -y && \ WORKDIR /usr/src/ # Download nginx source -ARG NGINX_VERSION="1.27.1" +ARG NGINX_VERSION="1.27.4" ARG NGINX_PKG="nginx-${NGINX_VERSION}.tar.gz" -ARG NGINX_SHA="bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc" +ARG NGINX_SHA="294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2" 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.27.1 +FROM zappi/nginx:1.27.4 USER root From df29b4bc3ff75edcc03ca93de0739fc91c785d6a Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Mon, 31 Mar 2025 11:25:11 +0200 Subject: [PATCH 2/4] Fix pid permission denied errors See: https://github.com/nginx/docker-nginx-unprivileged/blob/main/README.md#troubleshooting-tips --- config/main.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/main.conf b/config/main.conf index 664ccbd..a2f82f9 100644 --- a/config/main.conf +++ b/config/main.conf @@ -1,5 +1,7 @@ daemon off; +pid /tmp/nginx.pid; + worker_processes auto; worker_rlimit_nofile 8192; worker_shutdown_timeout 240s; From f5da61e316627ed29666ffcc8e66c8f65d54b2c9 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Mon, 31 Mar 2025 11:26:15 +0200 Subject: [PATCH 3/4] Remove deprecated docker compose version --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1ce4647..10d9517 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.7' services: app: image: caddy:2.1.1-alpine From c7e993d278c4361c2f1bfe000ef8efef8c6a9651 Mon Sep 17 00:00:00 2001 From: Zac Blazic Date: Mon, 31 Mar 2025 11:31:39 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80eea08..6f34f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.27.4 + +* Update base image to `zappi/nginx:1.27.4`. +* Fix pid file perimssion denied error. + ## 1.27.1-2 * Upgrade `headers-more-nginx-module` to `v0.38`.