Skip to content

Commit 552cf3b

Browse files
authored
Merge pull request #26 from Intellection/upgrade-nginx-to-v1.27.4
[SRE-4808] Upgrade Nginx to v1.27.4
2 parents 18e028b + c7e993d commit 552cf3b

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.27.4
4+
5+
* Update base image to `zappi/nginx:1.27.4`.
6+
* Fix pid file perimssion denied error.
7+
38
## 1.27.1-2
49

510
* Upgrade `headers-more-nginx-module` to `v0.38`.

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM zappi/nginx:1.27.1 AS builder
1+
FROM zappi/nginx:1.27.4 AS builder
22

33
USER root
44

@@ -16,9 +16,9 @@ RUN apt-get update -y && \
1616
WORKDIR /usr/src/
1717

1818
# Download nginx source
19-
ARG NGINX_VERSION="1.27.1"
19+
ARG NGINX_VERSION="1.27.4"
2020
ARG NGINX_PKG="nginx-${NGINX_VERSION}.tar.gz"
21-
ARG NGINX_SHA="bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc"
21+
ARG NGINX_SHA="294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2"
2222
RUN wget "http://nginx.org/download/${NGINX_PKG}" && \
2323
echo "${NGINX_SHA} *${NGINX_PKG}" | sha256sum -c - && \
2424
tar --no-same-owner -xzf ${NGINX_PKG} --one-top-level=nginx --strip-components=1
@@ -37,7 +37,7 @@ RUN cd nginx && \
3737
make modules
3838

3939
# Production container starts here
40-
FROM zappi/nginx:1.27.1
40+
FROM zappi/nginx:1.27.4
4141

4242
USER root
4343

config/main.conf

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
daemon off;
22

3+
pid /tmp/nginx.pid;
4+
35
worker_processes auto;
46
worker_rlimit_nofile 8192;
57
worker_shutdown_timeout 240s;

docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
version: '3.7'
32
services:
43
app:
54
image: caddy:2.1.1-alpine

0 commit comments

Comments
 (0)