Skip to content

Commit 2e5e7b7

Browse files
nginx-nms-docker updates and fixes (#92)
* Added API Connectivity Manager 1.5.0 support * Ownership fix * Startup script fix
1 parent ecacc0e commit 2e5e7b7

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

nginx-nms-docker/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This repository has been tested with:
2727
- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0
2828
- NGINX Management Suite API Connectivity Manager 1.0.0, 1.1.0, 1.1.1, 1.2.0, 1.3.0, 1.3.1, 1.4.0, 1.4.1, 1.5.0
2929
- Security Monitoring 1.0.0, 1.1.0, 1.2.0, 1.3.0
30-
- NGINX App Protect WAF compiler 3.1088.2, 4.2.0, 4.100.1
30+
- NGINX App Protect WAF compiler 3.1088.2, 4.2.0, 4.100.1, 4.218.0
3131

3232
## Prerequisites
3333

@@ -73,7 +73,7 @@ NGINX Management Suite Docker image builder
7373
-K [file.key] - Key file to pull packages from the official NGINX repository
7474
-A - Enable API Connectivity Manager - optional
7575
-W - Enable Security Monitoring - optional
76-
-P [version] - Enable WAF policy compiler, version can be [v3.1088.2|v4.2.0|v4.100.1] - optional
76+
-P [version] - Enable WAF policy compiler, version can be [v3.1088.2|v4.2.0|v4.100.1|v4.218.0] - optional
7777
7878
=== Examples:
7979
@@ -86,7 +86,7 @@ NGINX Management Suite Docker image builder
8686
8787
Automated build:
8888
./scripts/buildNIM.sh -i -C nginx-repo.crt -K nginx-repo.key
89-
-A -W -P v4.2.0 -t my.registry.tld/nginx-nms:2.6.0
89+
-A -W -P v4.218.0 -t my.registry.tld/nginx-nms:2.9.0
9090
```
9191

9292
### Automated build

nginx-nms-docker/container/startNIM.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ then
2525
python3 /deployment/app.py &
2626
fi
2727

28+
mkdir /nonexistent
29+
2830
/etc/nms/scripts/basic_passwords.sh $NIM_USERNAME $NIM_PASSWORD
2931

3032
# NGINX Management Suite version detection
@@ -77,7 +79,7 @@ esac
7779
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
7880
/bin/bash -c '`which chmod` 0700 /etc/nms/certs/services/core'
7981
/bin/bash -c '`which chmod` 0600 /etc/nms/certs/services/core/*'
80-
sudo -u nms /usr/bin/nms-core &
82+
su - nms -c "/usr/bin/nms-core &" -s /bin/bash
8183

8284
# Start nms dpm - from /lib/systemd/system/nms-dpm.service
8385
/bin/bash -c '`which mkdir` -p /var/lib/nms/streaming/'
@@ -90,15 +92,15 @@ sudo -u nms /usr/bin/nms-core &
9092
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
9193
/bin/bash -c '`which chmod` 0700 /etc/nms/certs/services/dataplane-manager'
9294
/bin/bash -c '`which chmod` 0600 /etc/nms/certs/services/dataplane-manager/*'
93-
sudo -u nms /usr/bin/nms-dpm &
95+
su - nms -c "/usr/bin/nms-dpm &" -s /bin/bash
9496

9597
# Start nms ingestion - from /lib/systemd/system/nms-ingestion.service
9698
/bin/bash -c '`which mkdir` -p /var/run/nms/'
9799
/bin/bash -c '`which mkdir` -p /var/log/nms/'
98100
/bin/bash -c '`which chown` -R nms:nms /var/log/nms/'
99101
/bin/bash -c '`which chmod` 0775 /var/log/nms/'
100102
/bin/bash -c '`which chown` -R nms:nms /var/run/nms/'
101-
sudo -u nms /usr/bin/nms-ingestion &
103+
su - nms -c "/usr/bin/nms-ingestion &" -s /bin/bash
102104

103105
# Start nms integrations - from /lib/systemd/system/nms-integrations.service
104106
/bin/bash -c '`which mkdir` -p /var/lib/nms/dqlite/'
@@ -109,11 +111,11 @@ sudo -u nms /usr/bin/nms-ingestion &
109111
/bin/bash -c '`which chown` -R nms:nms /var/log/nms/'
110112
/bin/bash -c '`which chmod` 0775 /var/log/nms/'
111113
/bin/bash -c '`which chown` nms:nms /etc/nms/certs/services/ca.crt'
112-
sudo -u nms /usr/bin/nms-integrations &
114+
su - nms -c "/usr/bin/nms-integrations &" -s /bin/bash
113115

114116
# Start API Connectivity Manager - from /lib/systemd/system/nms-acm.service
115117
sleep 5
116-
sudo -u nms /usr/bin/nms-acm server &
118+
su - nms -c "/usr/bin/nms-acm server &" -s /bin/bash
117119

118120
sleep 5
119121

nginx-nms-docker/scripts/buildNIM.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Automated build:\n\n
1919
-K [file.key]\t\t- Key file to pull packages from the official NGINX repository\n
2020
-A\t\t\t- Enable API Connectivity Manager - optional\n
2121
-W\t\t\t- Enable Security Monitoring - optional\n
22-
-P [version]\t\t- Enable WAF policy compiler, version can be [v3.1088.2|v4.2.0] - optional\n\n
22+
-P [version]\t\t- Enable WAF policy compiler, version can be [v3.1088.2|v4.2.0|v4.100.1|v4.218.0] - optional\n\n
2323
=== Examples:\n\n
2424
Manual build:\n
2525
\t$0 -n nim-files/nms-instance-manager_2.6.0-698150575~focal_amd64.deb \\\\\n
@@ -29,7 +29,7 @@ Manual build:\n
2929
\t\t-t my.registry.tld/nginx-nms:2.6.0\n\n
3030
Automated build:\n
3131
\t$0 -i -C nginx-repo.crt -K nginx-repo.key\n
32-
\t\t-A -W -P v4.2.0 -t my.registry.tld/nginx-nms:2.6.0\n
32+
\t\t-A -W -P v4.218.0 -t my.registry.tld/nginx-nms:2.9.0\n
3333
"
3434

3535
# Defaults

0 commit comments

Comments
 (0)