chore: update nginx to latest stable version (SQSERVICES-1479) (#2289)

* nginz/Dockerfile: Update used alpine base image * nginz: update nginx to latest stable v1.20.2
wireapp · Apr 14, 2022 · 6b6d896 · 6b6d896
1 parent 586958a
commit 6b6d896
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/changelog.d/5-internal/SQSERVICES-1479-nginx b/changelog.d/5-internal/SQSERVICES-1479-nginx
@@ -0,0 +1 @@
+Update nginx to latest stable: v1.20.2
diff --git a/services/nginz/Dockerfile b/services/nginz/Dockerfile
@@ -1,5 +1,5 @@
 # Requires docker >= 17.05 (requires support for multi-stage builds)
-FROM alpine:3.11 as libzauth-builder
+FROM alpine:3.15 as libzauth-builder
 
 # Compile libzauth
 COPY libs/libzauth /src/libzauth
@@ -8,7 +8,7 @@ RUN cd /src/libzauth/libzauth-c \
     && make install
 
 # Nginz container
-FROM alpine:3.11
+FROM alpine:3.15
 
 # Install libzauth
 COPY --from=libzauth-builder /usr/local/include/zauth.h /usr/local/include/zauth.h
@@ -46,7 +46,7 @@ ENV CONFIG --prefix=/etc/nginx \
 # This uses dockerfile logic from before 1.16
 ####################################################################################
 
-ENV NGINX_VERSION 1.16.1
+ENV NGINX_VERSION 1.20.2
 
 RUN apk update
 

diff --git 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.16.1
+NGINX_VERSION   = 1.20.2
 NGINZ_VERSION  ?=
 SWAGGER_VERSION:= 2.2.10
 ARCH         := $(shell if [ -f "`which dpkg-architecture`" ]; then dpkg-architecture -qDEB_HOST_ARCH; else [ -f "`which dpkg`" ] && dpkg --print-architecture; fi )