Renamed demo and added unprivileged docker image support

README.md

@@ -17,7 +17,7 @@ utilizing *fleet* and *etcd*.
 
 *   **mysql-galera-demo**: This demo uses NGINX Plus as a TCP load balancer for a MySQL Galera cluster consisting of two mysqld servers. It does round-robin load balancing between the 2 mysqld servers and also does active health checks using an xinetd script running on port 9200 inside each mysqld container.
 
-*   **nginx-agent-docker**: This demo helps building a docker image to deploy NGINX Plus and NGINX Agent for NGINX Management Suite, with optional support for NGINX App Protect WAF and NGINX Developer Portal for API Connectivity Manager
+*   **nginx-docker-builder**: This demo helps building a docker image to deploy NGINX Plus (privileged and unprivileged), NGINX App Protect WAF and NGINX Agent for NGINX Instance Manager and NGINX One Console
 
 *   **nginx-hello**: NGINX running as webserver in a docker container that serves a simple page containing the container's hostname, IP address and port
 

nginx-agent-docker/Dockerfile.oss → nginx-docker-builder/Dockerfile.oss

@@ -1,6 +1,7 @@
 FROM nginx:stable-bullseye-perl
 
 ARG NMS_URL
+ARG NGINX_AGENT=false
 
 # Initial packages setup
 RUN apt-get -y update \
@@ -15,10 +16,13 @@ RUN apt-get -y update \
 	&& groupadd -g 1001 nginx-agent \
 	&& usermod root -G nginx-agent \
 	&& usermod nginx -G nginx-agent \
-# NGINX Instance Manager agent installation
-	&& if [ `curl -o /dev/null -sk -w "%{http_code}\n" $NMS_URL/install/nginx-agent` = 200 ] ; then \
-	bash -c 'export DATA_PLANE_KEY="placeholder" && curl -k $NMS_URL/install/nginx-agent | sh' && echo "NGINX Agent installed"; else \
-	bash -c 'export DATA_PLANE_KEY="placeholder" && curl -k $NMS_URL/nginx-agent/install | sh || :' && echo "NGINX Agent installed"; fi
+# NGINX Agent
+        && if [ "$NGINX_AGENT" = "true" ] ; then \
+        apt-get -y install curl gnupg2 ca-certificates lsb-release debian-archive-keyring \
+        && curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /usr/share/keyrings/nginx-archive-keyring.gpg \
+        && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://packages.nginx.org/nginx-agent/debian/ `lsb_release -cs` agent" > /etc/apt/sources.list.d/nginx-agent.list \
+        && apt-get -y update \
+        && apt-get -y install nginx-agent; fi
 
 # Startup script
 COPY ./container/start.sh /deployment/

nginx-agent-docker/Dockerfile.plus → nginx-docker-builder/Dockerfile.plus

@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
-ARG NMS_URL
 ARG NAP_WAF=false
+ARG NGINX_AGENT=false
 
 # Initial packages setup
 RUN apt-get -y update \
@@ -12,7 +12,7 @@ RUN apt-get -y update \
 	&& wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \
 	&& chmod +x /usr/bin/yq
 
-# Use certificate and key from kubernetes secret
+# Use certificate and key from 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 \
@@ -32,14 +32,12 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 # Forward request logs to Docker log collector
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log \
-# User and group
-	&& groupadd -g 1001 nginx-agent \
-	&& usermod root -G nginx-agent \
-	&& usermod nginx -G nginx-agent \
-# NGINX Instance Manager agent installation
-	&& if [ `curl -o /dev/null -sk -w "%{http_code}\n" $NMS_URL/install/nginx-agent` = 200 ] ; then \
-	bash -c 'export DATA_PLANE_KEY="placeholder" && curl -k $NMS_URL/install/nginx-agent | sh' && echo "NGINX Agent installed"; else \
-	bash -c 'export DATA_PLANE_KEY="placeholder" && curl -k $NMS_URL/nginx-agent/install | sh || :' && echo "NGINX Agent installed"; fi
+# NGINX Agent
+	&& if [ "$NGINX_AGENT" = "true" ] ; then \
+	curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /usr/share/keyrings/nginx-archive-keyring.gpg \
+	&& echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://packages.nginx.org/nginx-agent/debian/ `lsb_release -cs` agent" > /etc/apt/sources.list.d/nginx-agent.list \
+	&& apt-get -y update \
+	&& apt-get -y install nginx-agent; fi
 
 # Startup script
 COPY ./container/start.sh /deployment/