Skip to content

Commit

Permalink
update ap version and debian distro
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafal Wegrzycki authored and rafwegv committed Jan 7, 2021
1 parent d652a42 commit 6223b12
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions build/appprotect/DockerfileWithAppProtectForPlus
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# syntax=docker/dockerfile:1.0-experimental
ARG GOLANG_CONTAINER=golang:latest

FROM debian:stretch-slim as base
FROM debian:buster-slim as base

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

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 APPPROTECT_MODULE_VERSION 23+3.281.0-1~buster
ENV APPPROTECT_PLUGIN_VERSION 3.281.0-1~buster
ENV APPPROTECT_ENGINE_VERSION 5.18.0-1~buster
ENV APPPROTECT_COMPILER_VERSION 5.18.0-1~buster
ENV APPPROTECT_SIG_VERSION 2020.12.30-1~buster
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2021.01.03-1~buster
ENV NGINX_PLUS_VERSION 23-1~buster
ENV NGINX_PLUS_RELEASE R23
ARG IC_VERSION

Expand Down Expand Up @@ -42,8 +42,8 @@ RUN --mount=type=secret,id=nginx-repo.crt \
&& echo "Acquire::https::plus-pkgs.nginx.com::SslCert \"/etc/ssl/nginx/nginx-repo.crt\";" >> /etc/apt/apt.conf.d/90nginx \
&& echo "Acquire::https::plus-pkgs.nginx.com::SslKey \"/etc/ssl/nginx/nginx-repo.key\";" >> /etc/apt/apt.conf.d/90nginx \
&& echo "Acquire::https::plus-pkgs.nginx.com::User-Agent \"k8s-ic-$IC_VERSION-app-$APPPROTECT_VERSION-apt\";" >> /etc/apt/apt.conf.d/90nginx \
&& echo "deb https://plus-pkgs.nginx.com/${NGINX_PLUS_RELEASE}/debian stretch nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
&& echo "deb https://app-protect-sigs.nginx.com/debian/ stretch nginx-plus\n" | tee /etc/apt/sources.list.d/app-protect-sigs.list \
&& echo "deb https://plus-pkgs.nginx.com/${NGINX_PLUS_RELEASE}/debian buster nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
&& echo "deb https://app-protect-sigs.nginx.com/debian/ buster nginx-plus\n" | tee /etc/apt/sources.list.d/app-protect-sigs.list \
&& wget https://nginx.org/keys/app-protect-sigs.key && apt-key add app-protect-sigs.key \
&& echo "Acquire::https::app-protect-sigs.nginx.com::Verify-Peer \"true\";" >> /etc/apt/apt.conf.d/90app-protect-sigs \
&& echo "Acquire::https::app-protect-sigs.nginx.com::Verify-Host \"true\";" >> /etc/apt/apt.conf.d/90app-protect-sigs \
Expand Down
12 changes: 6 additions & 6 deletions build/appprotect/DockerfileWithAppProtectForPlusForOpenShift
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ LABEL name="NGINX Ingress Controller" \
maintainer="NGINX Docker Maintainers <[email protected]>" \
vendor="NGINX Inc <[email protected]>"

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 APPPROTECT_MODULE_VERSION 23+3.281.0-1.el7.ngx
ENV APPPROTECT_PLUGIN_VERSION 3.281.0-1.el7.ngx
ENV APPPROTECT_ENGINE_VERSION 5.18.0-1.el7.ngx
ENV APPPROTECT_COMPILER_VERSION 5.18.0-1.el7.ngx
ENV APPPROTECT_SIG_VERSION 2020.12.30-1.el7.ngx
ENV APPPROTECT_THREAT_CAMPAIGNS_VERSION 2021.01.03-1.el7.ngx
ENV NGINX_PLUS_VERSION 23-1.el7.ngx
ARG IC_VERSION

Expand Down
2 changes: 1 addition & 1 deletion docs-web/technical-specifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ NGINX Plus images are not available through DockerHub.
-
* - Debian-based image with App Protect
- ``appprotect/DockerfileWithAppProtectForPlus``
- ``debian:stretch-slim``
- ``debian:buster-slim``
- NGINX Plus App Protect module
* - Ubi-based image with App Protect
- ``appprotect/DockerfileWithAppProtectForPlusForOpenShift``
Expand Down

0 comments on commit 6223b12

Please sign in to comment.