From bbce726f63f9d738729e827c09108e8ef96382c6 Mon Sep 17 00:00:00 2001 From: Lorcan McVeigh Date: Tue, 2 Jun 2020 16:03:21 +0100 Subject: [PATCH] Update NGINX version to 1.19.0 --- build/Dockerfile | 2 +- build/DockerfileForAlpine | 2 +- build/DockerfileWithOpentracing | 2 +- build/openshift/Dockerfile | 2 +- docs-web/technical-specifications.md | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index e28cda7d0a..6e28178201 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,6 +1,6 @@ ARG GOLANG_CONTAINER=golang:latest -FROM nginx:1.17.10 AS base +FROM nginx:1.19.0 AS base # forward nginx access and error logs to stdout and stderr of the ingress # controller process diff --git a/build/DockerfileForAlpine b/build/DockerfileForAlpine index 890feac74e..e9306a3cbe 100644 --- a/build/DockerfileForAlpine +++ b/build/DockerfileForAlpine @@ -1,6 +1,6 @@ ARG GOLANG_CONTAINER=golang:latest -FROM nginx:1.17.10-alpine AS base +FROM nginx:1.19.0-alpine AS base # forward nginx access and error logs to stdout and stderr of the ingress # controller process diff --git a/build/DockerfileWithOpentracing b/build/DockerfileWithOpentracing index 9a9f46cb35..ef27e365f7 100644 --- a/build/DockerfileWithOpentracing +++ b/build/DockerfileWithOpentracing @@ -1,4 +1,4 @@ -ARG NGINX_VERSION=1.17.10 +ARG NGINX_VERSION=1.19.0 ARG OPENTRACING_CPP_VERSION=1.5.1 ARG GOLANG_CONTAINER=golang:latest diff --git a/build/openshift/Dockerfile b/build/openshift/Dockerfile index f497f1742f..d18719dc62 100644 --- a/build/openshift/Dockerfile +++ b/build/openshift/Dockerfile @@ -9,7 +9,7 @@ LABEL name="NGINX Ingress Controller" \ maintainer="NGINX Docker Maintainers " \ vendor="NGINX Inc " -ENV NGINX_VERSION=1.17.10 +ENV NGINX_VERSION=1.19.0 RUN set -x \ && groupadd --system --gid 101 nginx \ diff --git a/docs-web/technical-specifications.md b/docs-web/technical-specifications.md index 51ddf3ec19..1815c4b1fe 100644 --- a/docs-web/technical-specifications.md +++ b/docs-web/technical-specifications.md @@ -11,7 +11,7 @@ We provide the following Docker images, which include NGINX/NGINX Plus bundled w ### Images with NGINX -All images include NGINX 1.17.10. +All images include NGINX 1.19.0. The supported architecture is x86-64. ```eval_rst @@ -25,17 +25,17 @@ The supported architecture is x86-64. - DockerHub image * - Debian-based image - ``Dockerfile`` - - ``nginx:1.17.10``, which is based on ``debian:buster-slim`` + - ``nginx:1.19.0``, which is based on ``debian:buster-slim`` - - ``nginx/nginx-ingress:1.7.0`` * - Alpine-based image - ``DockerfileForAlpine`` - - ``nginx:1.17.10-alpine``, which is based on ``alpine:3.10`` + - ``nginx:1.19.0-alpine``, which is based on ``alpine:3.10`` - - ``nginx/nginx-ingress:1.7.0-alpine`` * - Debian-based image with Opentracing - ``DockerfileWithOpentracing`` - - ``nginx:1.17.10``, which is based on ``debian:buster-slim`` + - ``nginx:1.19.0``, which is based on ``debian:buster-slim`` - OpenTracing API for C++ 1.5.1, NGINX plugin for OpenTracing, C++ OpenTracing binding for Jaeger 0.4.2 - * - Ubi-based image