diff --git a/changelog.d/5-internal/nginz-upgrade b/changelog.d/5-internal/nginz-upgrade new file mode 100644 index 0000000000..14a073bff4 --- /dev/null +++ b/changelog.d/5-internal/nginz-upgrade @@ -0,0 +1 @@ +Upgrade nginz/nginx to 1.22.1 diff --git a/services/nginz/Dockerfile b/services/nginz/Dockerfile index 640a9774be..e608fe9624 100644 --- a/services/nginz/Dockerfile +++ b/services/nginz/Dockerfile @@ -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 @@ -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=''; \ diff --git a/services/nginz/Makefile b/services/nginz/Makefile index 64ba94d036..57eb1cb9c2 100644 --- a/services/nginz/Makefile +++ b/services/nginz/Makefile @@ -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