Skip to content

Poc/waf v4.x #5572

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

Closed
wants to merge 21 commits into from
Closed

Poc/waf v4.x #5572

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
421e709
Update NAP build stages to install the latest version of AppProtect
shaun-nx May 3, 2024
2c22b2b
Merge branch 'main' into poc/waf-v4.9
shaun-nx May 3, 2024
5a6c550
Merge branch 'main' into poc/waf-v4.9
shaun-nx May 16, 2024
c33a0dd
Update debian-nap-plus build stage to pull from pkgs-test repo
shaun-nx May 16, 2024
0e945cf
Merge branch 'main' into poc/waf-v4.9
shaun-nx May 17, 2024
a2a9340
Udpate makefile and dockerfile to configure nginx package repo
shaun-nx May 17, 2024
e12d24a
Merge branch 'main' into poc/waf-v4.9
shaun-nx May 17, 2024
aa40f7a
Merge branch 'main' into poc/waf-v4.x
shaun-nx May 22, 2024
c6accd0
Ensure all packages come from `pkgs-test`
shaun-nx May 23, 2024
bdbaec8
Merge branch 'main' into poc/waf-v4.x
shaun-nx May 23, 2024
aec8d81
Pull packages from both pkgs.nginx.com and pkgs-test.nginx.com
shaun-nx May 24, 2024
9712896
Merge branch 'main' into poc/waf-v4.x
shaun-nx May 24, 2024
0e9988f
ci test
shaun-nx May 24, 2024
9a4b542
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 24, 2024
e03c49d
debug line
shaun-nx May 24, 2024
dddcf8f
format crt
shaun-nx May 24, 2024
a210ff9
curl test
shaun-nx May 24, 2024
2069aa1
Merge branch 'main' into poc/waf-v4.x
shaun-nx May 29, 2024
d5fcbdc
Remove pkgs-test
shaun-nx May 29, 2024
3d9f9f5
Remove newline
shaun-nx May 29, 2024
22e938b
Revert 90pkgs-nginx
shaun-nx May 29, 2024
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
10 changes: 5 additions & 5 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.6
ARG BUILD_OS=debian
ARG NGINX_PLUS_VERSION=R31
ARG NGINX_PLUS_VERSION=R32
ARG DOWNLOAD_TAG=edge
ARG DEBIAN_FRONTEND=noninteractive
ARG PREBUILT_BASE_IMG=nginx/nginx-ingress:${DOWNLOAD_TAG}
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN --mount=type=bind,from=alpine-fips-3.17,target=/tmp/fips/ \
&& cp -av /tmp/fips/etc/ssl/openssl.cnf /etc/ssl/openssl.cnf \
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
&& ldconfig /usr/local/lib/ \
&& apk add --no-cache app-protect=~31.4.815 app-protect-attack-signatures app-protect-threat-campaigns \
&& apk add --no-cache app-protect app-protect-attack-signatures app-protect-threat-campaigns \
&& sed -i -e '/nginx.com/d' /etc/apk/repositories


Expand Down Expand Up @@ -209,7 +209,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
## end of duplicated code
&& if [ -z "${NGINX_AGENT##true}" ]; then apt-get install --no-install-recommends --no-install-suggests -y nginx-agent; fi \
&& if [ -z "${NAP_MODULES##*waf*}" ]; then \
apt-get install --no-install-recommends --no-install-suggests -y app-protect=31+4.815* app-protect-engine=10.624* app-protect-common=10.624* app-protect-compiler=10.624* app-protect-plugin=5.24* nginx-plus-module-appprotect=31+4.815* app-protect-attack-signatures app-protect-threat-campaigns; \
apt-get install --no-install-recommends --no-install-suggests -y app-protect app-protect-attack-signatures app-protect-threat-campaigns; \
fi \
&& if [ -z "${NAP_MODULES##*dos*}" ]; then \
apt-get install --no-install-recommends --no-install-suggests -y app-protect-dos; \
Expand Down Expand Up @@ -283,7 +283,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
&& dnf --nodocs install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
&& rpm --import /tmp/app-protect-security-updates.key \
&& if [ -z "${NAP_MODULES##*waf*}" ]; then \
dnf --nodocs install -y app-protect-31+4.815* app-protect-attack-signatures app-protect-threat-campaigns; \
dnf --nodocs install -y app-protect app-protect-attack-signatures app-protect-threat-campaigns; \
fi \
# fix for CVEs
&& dnf upgrade -y curl ncurses \
Expand Down Expand Up @@ -329,7 +329,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
&& dnf --nodocs install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
&& rpm --import /tmp/app-protect-security-updates.key \
&& if [ -z "${NAP_MODULES##*waf*}" ]; then \
dnf --nodocs install -y app-protect-31+4.815* app-protect-attack-signatures app-protect-threat-campaigns; \
dnf --nodocs install -y app-protect app-protect-attack-signatures app-protect-threat-campaigns; \
fi \
&& if [ -z "${NAP_MODULES##*dos*}" ]; then \
dnf --nodocs install -y app-protect-dos; \
Expand Down