Skip to content

Commit 7ca1919

Browse files
authored
Update NGINX version to 1.19.8 (#1454)
1 parent 32033d8 commit 7ca1919

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

build/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG GOLANG_CONTAINER=golang:latest
22

3-
FROM nginx:1.19.7 AS base
3+
FROM nginx:1.19.8 AS base
44

55
# forward nginx access and error logs to stdout and stderr of the ingress
66
# controller process
@@ -9,15 +9,15 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
99
&& ln -sf /proc/1/fd/2 /var/log/nginx/error.log
1010

1111
RUN mkdir -p /var/lib/nginx \
12-
/etc/nginx/secrets \
13-
/etc/nginx/stream-conf.d \
12+
/etc/nginx/secrets \
13+
/etc/nginx/stream-conf.d \
1414
&& apt-get update \
1515
&& apt-get install -y libcap2-bin \
1616
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
17-
'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
17+
'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
1818
&& chown -R nginx:0 /etc/nginx \
19-
/var/cache/nginx \
20-
/var/lib/nginx \
19+
/var/cache/nginx \
20+
/var/lib/nginx \
2121
&& apt-get remove --purge -y libcap2-bin \
2222
&& rm /etc/nginx/conf.d/* \
2323
&& rm -rf /var/lib/apt/lists/*

build/DockerfileForAlpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG GOLANG_CONTAINER=golang:latest
22

3-
FROM nginx:1.19.7-alpine AS base
3+
FROM nginx:1.19.8-alpine AS base
44

55
# forward nginx access and error logs to stdout and stderr of the ingress
66
# controller process

build/DockerfileWithOpentracing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NGINX_VERSION=1.19.7
1+
ARG NGINX_VERSION=1.19.8
22
ARG OPENTRACING_CPP_VERSION=1.5.1
33
ARG GOLANG_CONTAINER=golang:latest
44

build/openshift/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ ARG GOLANG_CONTAINER=golang:latest
33
FROM registry.access.redhat.com/ubi8/ubi:8.3 AS base
44

55
LABEL name="NGINX Ingress Controller" \
6-
description="The Ingress controller is an application that runs in a cluster and configures an HTTP load balancer according to Ingress resources." \
7-
summary="The Ingress controller is an application that runs in a cluster and configures an HTTP load balancer according to Ingress resources." \
8-
io.openshift.tags="nginx,ingress-controller,ingress,controller,kubernetes,openshift" \
9-
maintainer="NGINX Docker Maintainers <[email protected]>" \
10-
vendor="NGINX Inc <[email protected]>"
6+
description="The Ingress controller is an application that runs in a cluster and configures an HTTP load balancer according to Ingress resources." \
7+
summary="The Ingress controller is an application that runs in a cluster and configures an HTTP load balancer according to Ingress resources." \
8+
io.openshift.tags="nginx,ingress-controller,ingress,controller,kubernetes,openshift" \
9+
maintainer="NGINX Docker Maintainers <[email protected]>" \
10+
vendor="NGINX Inc <[email protected]>"
1111

12-
ENV NGINX_VERSION=1.19.7
12+
ENV NGINX_VERSION=1.19.8
1313

1414
RUN set -x \
1515
&& groupadd --system --gid 101 nginx \
@@ -22,13 +22,13 @@ RUN set -x \
2222
&& echo "module_hotfixes=true" >> /etc/yum.repos.d/nginx.repo \
2323
&& yum install -y nginx-${NGINX_VERSION} \
2424
&& mkdir -p /var/lib/nginx \
25-
/etc/nginx/secrets \
26-
/etc/nginx/stream-conf.d \
25+
/etc/nginx/secrets \
26+
/etc/nginx/stream-conf.d \
2727
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
28-
'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
28+
'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
2929
&& chown -R nginx:0 /etc/nginx \
30-
/var/cache/nginx \
31-
/var/lib/nginx \
30+
/var/cache/nginx \
31+
/var/lib/nginx \
3232
&& rm /etc/yum.repos.d/nginx.repo \
3333
&& rm /etc/nginx/conf.d/*
3434

docs-web/technical-specifications.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ The NGINX Ingress Controller has been verified to run on the following Kubernete
77

88
## Supported Docker Images
99

10-
We provide the following Docker images, which include NGINX/NGINX Plus bundled with the Ingress Controller binary.
10+
We provide the following Docker images, which include NGINX/NGINX Plus bundled with the Ingress Controller binary.
1111

12-
### Images with NGINX
12+
### Images with NGINX
1313

14-
All images include NGINX 1.19.7.
14+
All images include NGINX 1.19.8.
1515
The supported architecture is x86-64.
1616

1717
```eval_rst
@@ -25,23 +25,23 @@ The supported architecture is x86-64.
2525
- DockerHub image
2626
* - Debian-based image
2727
- ``Dockerfile``
28-
- ``nginx:1.19.7``, which is based on ``debian:buster-slim``
29-
-
28+
- ``nginx:1.19.8``, which is based on ``debian:buster-slim``
29+
-
3030
- ``nginx/nginx-ingress:1.10.0``
3131
* - Alpine-based image
3232
- ``DockerfileForAlpine``
33-
- ``nginx:1.19.7-alpine``, which is based on ``alpine:3.13``
34-
-
33+
- ``nginx:1.19.8-alpine``, which is based on ``alpine:3.13``
34+
-
3535
- ``nginx/nginx-ingress:1.10.0-alpine``
3636
* - Debian-based image with Opentracing
3737
- ``DockerfileWithOpentracing``
38-
- ``nginx:1.19.7``, which is based on ``debian:buster-slim``
39-
- OpenTracing API for C++ 1.5.1, NGINX plugin for OpenTracing, C++ OpenTracing binding for Jaeger 0.4.2
40-
-
38+
- ``nginx:1.19.8``, which is based on ``debian:buster-slim``
39+
- OpenTracing API for C++ 1.5.1, NGINX plugin for OpenTracing, C++ OpenTracing binding for Jaeger 0.4.2
40+
-
4141
* - Ubi-based image
4242
- ``openshift/Dockerfile``
4343
- ``registry.access.redhat.com/ubi8/ubi:8.3``
44-
-
44+
-
4545
- ``nginx/nginx-ingress:1.10.0-ubi``
4646
```
4747
\* -- Dockerfile paths are relative to the ``build`` folder of the Ingress Controller git repo.
@@ -64,23 +64,23 @@ NGINX Plus images are not available through DockerHub.
6464
* - Debian-based image
6565
- ``DockerfileForPlus``
6666
- ``debian:buster-slim``
67-
-
67+
-
6868
* - Debian-based image with Opentracing
6969
- ``DockerfileWithOpentracingForPlus``
7070
- ``debian:buster-slim``
71-
- NGINX Plus OpenTracing module, C++ OpenTracing binding for Jaeger 0.4.2
71+
- NGINX Plus OpenTracing module, C++ OpenTracing binding for Jaeger 0.4.2
7272
* - Ubi-based image
7373
- ``openshift/DockerfileForPlus``
7474
- ``registry.access.redhat.com/ubi8/ubi:8.3``
75-
-
75+
-
7676
* - Debian-based image with App Protect
7777
- ``appprotect/DockerfileWithAppProtectForPlus``
7878
- ``debian:buster-slim``
7979
- NGINX Plus App Protect module
8080
* - Ubi-based image with App Protect
8181
- ``appprotect/DockerfileWithAppProtectForPlusForOpenShift``
8282
- ``registry.access.redhat.com/ubi7/ubi``
83-
- NGINX Plus App Protect module
83+
- NGINX Plus App Protect module
8484
```
8585

8686
\* -- Dockerfile paths are relative to the ``build`` folder of the Ingress Controller git repo.

0 commit comments

Comments
 (0)