Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5-internal/nginz-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade nginz/nginx to 1.22.1
4 changes: 2 additions & 2 deletions services/nginz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ENV CONFIG --prefix=/etc/nginx \
# This uses dockerfile logic from before 1.16
####################################################################################

ENV NGINX_VERSION 1.20.2
ENV NGINX_VERSION 1.22.1

RUN apk update

Expand All @@ -72,7 +72,7 @@ RUN curl -h
RUN set -x \
&& addgroup -g 101 -S nginx \
&& adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \
&& export GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& export GPG_KEYS=13C82A63B603576156E30A4EA0EA981B66B0D967 \
&& curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
&& curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc -o nginx.tar.gz.asc \
&& found=''; \
Expand Down
2 changes: 1 addition & 1 deletion services/nginz/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
LANG := en_US.UTF-8
SHELL := /usr/bin/env bash
NAME := nginz
NGINX_VERSION = 1.20.2
NGINX_VERSION = 1.22.1
NGINZ_VERSION ?=
SWAGGER_VERSION:= 2.2.10
SHELL := /usr/bin/env bash
Expand Down