Skip to content

Commit 474f071

Browse files
nginx-nms-docker container start script updated (#125)
* Added API Connectivity Manager 1.5.0 support * Ownership fix * Startup script fix * NGINX App Protect WAF updates * Tested with NGINX Instance Manager 2.9.1 * Added docker-compose support * Tested with NGINX Instance Manager 2.10.0 and Security Monitoring 1.4.0 * Tested with NGINX Instance Manager 2.10.0 and API Connectivity Manager 1.5.0 * Tested with API Connectivity Manager 1.6.0 * Tested with API Connectivity Manager 1.6.0 * README updated * Added support for NGINX Instance Manager 2.10.1 and App Delivery Manager 4.0.0 * Fixed NGINX App Protect detection bug for NGINX Instance Manager 2.10.0+ * Fixed agent syslog receiver bug * README updated * Tested with NGINX Instance Manager 2.11.0 and Security Monitoring 1.5.0 * Tested with NGINX Instance Manager 2.11.0 * Tested with NGINX API Connectivity Manager 1.7.0 * Tested with NGINX Instance Manager 2.12.0 and Security Monitoring 1.6.0 * Tested with API Connectivity Manager 1.8.0 * Tested with API Connectivity Manager 1.8.0 * Tested with NGINX Instance Manager 2.12.0 * Dockerfile updated * Support for NGINX Instance Manager 2.13 * Tested with NGINX Instance Manager 2.13 * Tested with NIM 2.14.0 and SM 1.7.0 * Tested with NIM 2.14.0 and SM 1.7.0 * Tested with NGINX Instance Manager 2.14.0 * Tested with NGINX Instance Manager 2.14.0 * Tested with NGINX App Protect compiler v4.583.0 * Start script updated --------- Signed-off-by: 65397 <[email protected]>
1 parent c5f62ab commit 474f071

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

nginx-nms-docker/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ This repository has been tested with:
3232

3333
## Prerequisites
3434

35+
This repository has been tested with:
36+
3537
- Docker 20.10+ to build the image
3638
- Private registry to push the target Docker image
37-
- Kubernetes/Openshift cluster with dynamic storage provisioner enabled: see the [example](contrib/pvc-provisioner)
39+
- Kubernetes cluster with dynamic storage provisioner enabled: see the [example](contrib/pvc-provisioner)
3840
- NGINX Ingress Controller with `VirtualServer` CRD support (see https://docs.nginx.com/nginx-ingress-controller/configuration/virtualserver-and-virtualserverroute-resources/)
3941
- Access to F5/NGINX downloads to fetch NGINX Instance Manager 2.4.0+ installation .deb file and API Connectivity Manager 1.0+ installation .deb file (when running in manual mode)
4042
- Valid NGINX license certificate and key to fetch NGINX Management Suite packages (when running in automated mode)

nginx-nms-docker/container/startNIM.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ esac
9191
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
9292
/bin/bash -c '`which chmod` 0700 /etc/nms/certs/services/core'
9393
/bin/bash -c '`which chmod` 0600 /etc/nms/certs/services/core/*'
94-
su - nms -c "/usr/bin/nms-core &" -s /bin/bash
94+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-core &' -s /bin/bash
9595

9696
# Start nms dpm - from /lib/systemd/system/nms-dpm.service
9797
/bin/bash -c '`which mkdir` -p /var/lib/nms/streaming/'
@@ -104,15 +104,15 @@ su - nms -c "/usr/bin/nms-core &" -s /bin/bash
104104
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
105105
/bin/bash -c '`which chmod` 0700 /etc/nms/certs/services/dataplane-manager'
106106
/bin/bash -c '`which chmod` 0600 /etc/nms/certs/services/dataplane-manager/*'
107-
su - nms -c "/usr/bin/nms-dpm &" -s /bin/bash
107+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-dpm &' -s /bin/bash
108108

109109
# Start nms ingestion - from /lib/systemd/system/nms-ingestion.service
110110
/bin/bash -c '`which mkdir` -p /var/run/nms/'
111111
/bin/bash -c '`which mkdir` -p /var/log/nms/'
112112
/bin/bash -c '`which chown` -R nms:nms /var/log/nms/'
113113
/bin/bash -c '`which chmod` 0775 /var/log/nms/'
114114
/bin/bash -c '`which chown` -R nms:nms /var/run/nms/'
115-
su - nms -c "/usr/bin/nms-ingestion &" -s /bin/bash
115+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-ingestion &' -s /bin/bash
116116

117117
# Start nms integrations - from /lib/systemd/system/nms-integrations.service
118118
/bin/bash -c '`which mkdir` -p /var/lib/nms/dqlite/'
@@ -123,29 +123,29 @@ su - nms -c "/usr/bin/nms-ingestion &" -s /bin/bash
123123
/bin/bash -c '`which chown` -R nms:nms /var/log/nms/'
124124
/bin/bash -c '`which chmod` 0775 /var/log/nms/'
125125
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
126-
su - nms -c "/usr/bin/nms-integrations &" -s /bin/bash
126+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-integrations &' -s /bin/bash
127127

128128
# Start API Connectivity Manager - from /lib/systemd/system/nms-acm.service
129129
if [ -f /usr/bin/nms-acm ]
130130
then
131131
sleep 5
132-
su - nms -c "/usr/bin/nms-acm server &" -s /bin/bash
132+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-acm server &' -s /bin/bash
133133
fi
134134

135135
# Start App Delivery Manager
136136
if [ -f /usr/bin/nms-adm ]
137137
then
138138
/bin/bash -c '`which mkdir` -p /var/run/nms/modules/adm'
139139
/bin/bash -c '`which chown` -R nms:nms /var/run/nms/modules/adm'
140-
su - nms -c "/usr/bin/nms-adm server &" -s /bin/bash
140+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-adm server &' -s /bin/bash
141141
fi
142142

143143
sleep 5
144144

145145
# Start Security Monitoring
146146
if [ -f /usr/bin/nms-sm ]
147147
then
148-
su - nms -c "/usr/bin/nms-sm start &" -s /bin/bash
148+
su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-sm start &' -s /bin/bash
149149
fi
150150

151151
chmod 666 /var/run/nms/*.sock

0 commit comments

Comments
 (0)