Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update NGINX versions and AppProtect #1291

Merged
merged 4 commits into from
Dec 18, 2020
Merged

Update NGINX versions and AppProtect #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc09c5
Update NGINX version to 1.19.6
Dean-Coakley Dec 17, 2020
04a4972
Update NGINX Plus version to R23
Dean-Coakley Dec 17, 2020
e1d56b7
Update NGINX versions in tech spec doc
Dean-Coakley Dec 17, 2020
f740b94
Fix NAP test to not create duplicate headers
Dean-Coakley Dec 18, 2020
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
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GOLANG_CONTAINER=golang:latest

FROM nginx:1.19.3 AS base
FROM nginx:1.19.6 AS base

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileForAlpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GOLANG_CONTAINER=golang:latest

FROM nginx:1.19.3-alpine AS base
FROM nginx:1.19.6-alpine AS base

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileForPlus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM debian:buster-slim AS base

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"

ENV NGINX_PLUS_VERSION 22-1~buster
ENV NGINX_PLUS_VERSION 23-1~buster
ARG IC_VERSION

# Download certificate and key from the customer portal (https://cs.nginx.com)
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileWithOpentracing
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NGINX_VERSION=1.19.3
ARG NGINX_VERSION=1.19.6
ARG OPENTRACING_CPP_VERSION=1.5.1
ARG GOLANG_CONTAINER=golang:latest

Expand Down
4 changes: 2 additions & 2 deletions build/DockerfileWithOpentracingForPlus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ RUN set -x \
FROM debian:buster-slim AS base
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"

ENV NGINX_PLUS_VERSION 22-1~buster
ENV NGINX_OPENTRACING_MODULE_VERSION 22+0.9.0-1~buster
ENV NGINX_PLUS_VERSION 23-1~buster
ENV NGINX_OPENTRACING_MODULE_VERSION 23+0.9.0-1~buster

ARG IC_VERSION

Expand Down
18 changes: 9 additions & 9 deletions build/appprotect/DockerfileWithAppProtectForPlus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ FROM debian:stretch-slim as base

LABEL maintainer="NGINX Docker Maintainers <[email protected]>"

ENV APPPROTECT_MODULE_VERSION 22+3.216.0-1~stretch
ENV APPPROTECT_PLUGIN_VERSION 3.216.0-1~stretch
ENV APPPROTECT_ENGINE_VERSION 4.40.0-1~stretch
ENV APPPROTECT_COMPILER_VERSION 4.40.0-1~stretch
ENV APPPROTECT_SIG_VERSION 2020.11.16-1~stretch
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2020.11.18-1~stretch
ENV NGINX_PLUS_VERSION 22-1~stretch
ENV NGINX_PLUS_RELEASE R22
ENV APPPROTECT_MODULE_VERSION 23+3.263.0-1~stretch
ENV APPPROTECT_PLUGIN_VERSION 3.263.0-1~stretch
ENV APPPROTECT_ENGINE_VERSION 5.9.4-1~stretch
ENV APPPROTECT_COMPILER_VERSION 5.9.4-1~stretch
ENV APPPROTECT_SIG_VERSION 2020.12.13-1~stretch
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2020.12.01-1~stretch
ENV NGINX_PLUS_VERSION 23-1~stretch
ENV NGINX_PLUS_RELEASE R23
ARG IC_VERSION

# Download certificate and key from the customer portal (https://cs.nginx.com)
Expand Down Expand Up @@ -74,7 +74,7 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
&& ln -sf /proc/1/fd/1 /var/log/nginx/stream-access.log \
&& ln -sf /proc/1/fd/2 /var/log/nginx/error.log

RUN mkdir -p /var/lib/nginx \
RUN mkdir -p /var/lib/nginx \
/etc/nginx/stream-conf.d \
/etc/nginx/secrets \
/etc/nginx/waf \
Expand Down
16 changes: 8 additions & 8 deletions build/appprotect/DockerfileWithAppProtectForPlusForOpenShift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ LABEL name="NGINX Ingress Controller" \
maintainer="NGINX Docker Maintainers <[email protected]>" \
vendor="NGINX Inc <[email protected]>"

ENV APPPROTECT_MODULE_VERSION 22+3.216.0-1.el7.ngx
ENV APPPROTECT_PLUGIN_VERSION 3.216.0-1.el7.ngx
ENV APPPROTECT_ENGINE_VERSION 4.40.3-1.el7.ngx
ENV APPPROTECT_COMPILER_VERSION 4.40.3-1.el7.ngx
ENV APPPROTECT_SIG_VERSION 2020.11.16-1.el7.ngx
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2020.11.18-1.el7.ngx
ENV NGINX_PLUS_VERSION 22-1.el7.ngx
ENV APPPROTECT_MODULE_VERSION 23+3.263.0-1.el7.ngx
ENV APPPROTECT_PLUGIN_VERSION 3.263.0-1.el7.ngx
ENV APPPROTECT_ENGINE_VERSION 5.9.4-1.el7.ngx
ENV APPPROTECT_COMPILER_VERSION 5.9.4-1.el7.ngx
ENV APPPROTECT_SIG_VERSION 2020.12.13-1.el7.ngx
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2020.12.01-1.el7.ngx
ENV NGINX_PLUS_VERSION 23-1.el7.ngx
ARG IC_VERSION

# Download certificate and key from the customer portal (https://cs.nginx.com)
Expand Down Expand Up @@ -74,7 +74,7 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
&& ln -sf /proc/1/fd/1 /var/log/nginx/stream-access.log \
&& ln -sf /proc/1/fd/2 /var/log/nginx/error.log

RUN mkdir -p /var/lib/nginx \
RUN mkdir -p /var/lib/nginx \
/etc/nginx/stream-conf.d \
/etc/nginx/secrets \
/etc/nginx/waf \
Expand Down
2 changes: 1 addition & 1 deletion build/openshift/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ LABEL name="NGINX Ingress Controller" \
maintainer="NGINX Docker Maintainers <[email protected]>" \
vendor="NGINX Inc <[email protected]>"

ENV NGINX_VERSION=1.19.3
ENV NGINX_VERSION=1.19.6

RUN set -x \
&& groupadd --system --gid 101 nginx \
Expand Down
2 changes: 1 addition & 1 deletion build/openshift/DockerfileForPlus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LABEL name="NGINX Ingress Controller" \
maintainer="NGINX Docker Maintainers <[email protected]>" \
vendor="NGINX Inc <[email protected]>"

ENV NGINX_PLUS_VERSION 22-1.el8.ngx
ENV NGINX_PLUS_VERSION 23-1.el8.ngx
ARG IC_VERSION

# Download certificate and key from the customer portal (https://cs.nginx.com)
Expand Down
10 changes: 5 additions & 5 deletions docs-web/technical-specifications.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.3.
All images include NGINX 1.19.6.
The supported architecture is x86-64.

```eval_rst
Expand All @@ -25,17 +25,17 @@ The supported architecture is x86-64.
- DockerHub image
* - Debian-based image
- ``Dockerfile``
- ``nginx:1.19.3``, which is based on ``debian:buster-slim``
- ``nginx:1.19.6``, which is based on ``debian:buster-slim``
-
- ``nginx/nginx-ingress:1.9.1``
* - Alpine-based image
- ``DockerfileForAlpine``
- ``nginx:1.19.3-alpine``, which is based on ``alpine:3.10``
- ``nginx:1.19.6-alpine``, which is based on ``alpine:3.10``
-
- ``nginx/nginx-ingress:1.9.1-alpine``
* - Debian-based image with Opentracing
- ``DockerfileWithOpentracing``
- ``nginx:1.19.3``, which is based on ``debian:buster-slim``
- ``nginx:1.19.6``, 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
Expand All @@ -48,7 +48,7 @@ The supported architecture is x86-64.

### Images with NGINX Plus

All images include NGINX Plus R22.
All images include NGINX Plus R23.
The supported architecture is x86-64.

NGINX Plus images are not available through DockerHub.
Expand Down
6 changes: 3 additions & 3 deletions tests/suite/test_app_protect_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ def test_ap_sec_logs_on(

print("----------------------- Send valid request ----------------------")
headers = {
"host": ingress_host,
"user-agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0"
}
"Host": ingress_host,
"User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0"
}
response = requests.get(
appprotect_setup.req_url, headers=headers, verify=False
)
Expand Down