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.

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

Tested with NGINX Instance Manager 2.12.0 #108

Merged
merged 36 commits into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c556c7d
Added API Connectivity Manager 1.5.0 support
fabriziofiorucci Mar 29, 2023
eebf814
Ownership fix
fabriziofiorucci Mar 30, 2023
889dd60
Merge branch 'nginxinc:master' into master
fabriziofiorucci Mar 30, 2023
9aac959
Startup script fix
fabriziofiorucci Mar 31, 2023
bcc0ac1
Merge branch 'master' of github.com:fabriziofiorucci/NGINX-Demos
fabriziofiorucci Mar 31, 2023
500ce65
Startup script fix
fabriziofiorucci Mar 31, 2023
2fae74f
NGINX App Protect WAF updates
fabriziofiorucci Apr 3, 2023
756b3c0
Tested with NGINX Instance Manager 2.9.1
fabriziofiorucci Apr 7, 2023
16d9a06
Merge branch 'nginxinc:master' into master
fabriziofiorucci Apr 7, 2023
380c1d5
Added docker-compose support
fabriziofiorucci Apr 18, 2023
c7e6856
Merge branch 'master' of github.com:fabriziofiorucci/NGINX-Demos
fabriziofiorucci Apr 18, 2023
28be917
Merge branch 'nginxinc:master' into master
fabriziofiorucci Apr 27, 2023
74eabe6
Tested with NGINX Instance Manager 2.10.0 and Security Monitoring 1.4.0
fabriziofiorucci Apr 27, 2023
e539766
Tested with NGINX Instance Manager 2.10.0 and API Connectivity Manage…
fabriziofiorucci Apr 27, 2023
3086f4a
Merge branch 'nginxinc:master' into master
fabriziofiorucci May 11, 2023
5115664
Tested with API Connectivity Manager 1.6.0
fabriziofiorucci May 11, 2023
9167ad4
Tested with API Connectivity Manager 1.6.0
fabriziofiorucci May 13, 2023
2f64eea
Merge branch 'nginxinc:master' into master
fabriziofiorucci May 29, 2023
7b0e8fc
README updated
fabriziofiorucci May 29, 2023
93c7575
Added support for NGINX Instance Manager 2.10.1 and App Delivery Mana…
fabriziofiorucci May 29, 2023
eb04147
Fixed NGINX App Protect detection bug for NGINX Instance Manager 2.10.0+
fabriziofiorucci May 31, 2023
2329a18
Fixed agent syslog receiver bug
fabriziofiorucci Jun 5, 2023
1cd9453
README updated
fabriziofiorucci Jun 9, 2023
5904979
Tested with NGINX Instance Manager 2.11.0 and Security Monitoring 1.5.0
fabriziofiorucci Jun 16, 2023
dafcf88
Tested with NGINX Instance Manager 2.11.0
fabriziofiorucci Jun 16, 2023
0ff4e8c
Tested with NGINX API Connectivity Manager 1.7.0
fabriziofiorucci Jun 26, 2023
5160332
Merge branch 'master' into master
fabriziofiorucci Jun 26, 2023
40ea4f2
Tested with NGINX Instance Manager 2.12.0 and Security Monitoring 1.6.0
fabriziofiorucci Jul 24, 2023
fd7d5a1
Merge branch 'master' into master
fabriziofiorucci Jul 24, 2023
f77f6f3
Tested with API Connectivity Manager 1.8.0
fabriziofiorucci Jul 27, 2023
5c400a4
Merge branch 'master' of github.com:fabriziofiorucci/NGINX-Demos
fabriziofiorucci Jul 27, 2023
02f0260
Tested with API Connectivity Manager 1.8.0
fabriziofiorucci Jul 27, 2023
5aa7100
Tested with NGINX Instance Manager 2.12.0
fabriziofiorucci Aug 3, 2023
d54aee4
Merge branch 'master' into master
fabriziofiorucci Aug 3, 2023
1eb9acc
Dockerfile updated
fabriziofiorucci Aug 3, 2023
e85eebc
Merge branch 'master' of github.com:fabriziofiorucci/NGINX-Demos
fabriziofiorucci Aug 3, 2023
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
23 changes: 12 additions & 11 deletions nginx-agent-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,14 @@ ARG NAP_WAF=false
# Initial packages setup
RUN apt-get -y update \
&& apt-get -y install apt-transport-https lsb-release ca-certificates wget gnupg2 curl debian-archive-keyring \
# NGINX Instance Manager agent setup
&& mkdir -p /deployment /etc/ssl/nginx \
# Agent installation
&& bash -c 'curl -k $NMS_URL/install/nginx-agent | sh' && echo "Agent installed from NMS"

# Startup script
COPY ./container/start.sh /deployment/
&& addgroup --system --gid 20983 nginx \
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 20983 nginx

# Download certificate and key from the customer portal (https://account.f5.com)
# and copy to the build context
# Use certificate and key from kubernetes secret
RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
--mount=type=secret,id=nginx-key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
set -x \
# Startup script
&& chmod +x /deployment/start.sh && touch /.dockerenv \
# Install prerequisite packages:
&& wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /usr/share/keyrings/nginx-archive-keyring.gpg \
&& printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/debian `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
Expand Down Expand Up @@ -53,7 +46,15 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644

&& groupadd -g 1001 nginx-agent \
&& usermod root -G nginx-agent \
&& usermod nginx -G nginx-agent
&& usermod nginx -G nginx-agent \

# NGINX Instance Manager agent installation
&& bash -c 'curl -k $NMS_URL/install/nginx-agent | sh' && echo "Agent installed from NMS"

# Startup script
COPY ./container/start.sh /deployment/
RUN chmod +x /deployment/start.sh && touch /.dockerenv


EXPOSE 80
STOPSIGNAL SIGTERM
Expand Down
4 changes: 2 additions & 2 deletions nginx-agent-docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ This repository can be used to build a docker image with NGINX Plus and NGINX In

This repository has been tested with NGINX agent for:

- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.10.0, 2.10.1, 2.11.0
- API Connectivity Manager 1.4.0, 1.5.0, 1.6.0
- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.10.0, 2.10.1, 2.11.0, 2.12.0
- API Connectivity Manager 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.8.0
- NGINX App Protect WAF 4.100.1+

## Prerequisites
Expand Down