Dockerfile updated (#82)

* Added nginx-agent-docker

* Changed base image to Debian bullseye

* Update nginx-agent-docker/Dockerfile

Thank you

Co-authored-by: Luca Comellini <[email protected]>
Signed-off-by: 65397 <[email protected]>

* Update nginx-agent-docker/Dockerfile

Co-authored-by: Luca Comellini <[email protected]>
Signed-off-by: 65397 <[email protected]>

* Update nginx-agent-docker/Dockerfile

Co-authored-by: Luca Comellini <[email protected]>
Signed-off-by: 65397 <[email protected]>

* Update nginx-agent-docker/Dockerfile

Co-authored-by: Luca Comellini <[email protected]>
Signed-off-by: 65397 <[email protected]>

* Dockerfile updated

---------

Signed-off-by: 65397 <[email protected]>
Co-authored-by: Luca Comellini <[email protected]>

Author: fabriziofiorucci

nginx-agent-docker/Dockerfile

@@ -6,7 +6,7 @@ ARG NAP_WAF=false
 
 # Initial packages setup
 RUN	apt-get -y update \
-	&& apt-get -y install -y apt-transport-https lsb-release ca-certificates wget gnupg2 curl \
+	&& 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
@@ -23,17 +23,15 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 # Startup script
 	&& chmod +x /deployment/start.sh && touch /.dockerenv \
 # Install prerequisite packages:
-	&& apt-get -y update \
-	&& apt-get -y install debian-archive-keyring \
-	&& wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor | tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null \
-	&& printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/debian `lsb_release -cs` nginx-plus\n" | tee /etc/apt/sources.list.d/nginx-plus.list \
+	&& 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 \
 	&& wget -P /etc/apt/apt.conf.d https://cs.nginx.com/static/files/90pkgs-nginx \
 	&& apt-get -y update \
 	&& apt-get -y install nginx-plus nginx-plus-module-njs nginx-plus-module-prometheus \
 
 # Optional NGINX App Protect WAF
 	&& if [ "$NAP_WAF" = "true" ] ; then \
-	wget -qO - https://cs.nginx.com/static/keys/app-protect-security-updates.key | gpg --dearmor | tee /usr/share/keyrings/app-protect-security-updates.gpg >/dev/null \
+	wget -qO - https://cs.nginx.com/static/keys/app-protect-security-updates.key | gpg --dearmor > /usr/share/keyrings/app-protect-security-updates.gpg \
 	&& printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect/debian `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-app-protect.list \
 	&& printf "deb [signed-by=/usr/share/keyrings/app-protect-security-updates.gpg] https://pkgs.nginx.com/app-protect-security-updates/debian `lsb_release -cs` nginx-plus\n" >> /etc/apt/sources.list.d/nginx-app-protect.list \
 	&& apt-get -y update \
@@ -42,12 +40,12 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 # Optional API Connectivity Manager DevPortal
 # https://docs.nginx.com/nginx-management-suite/admin-guides/installation/on-prem/install-guide/
 	&& if [ "$DEVPORTAL" = "true" ] ; then \
-	printf "deb https://pkgs.nginx.com/nms/debian `lsb_release -cs` nginx-plus\n" | tee /etc/apt/sources.list.d/nms.list \
+	printf "deb https://pkgs.nginx.com/nms/debian `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nms.list \
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 \
 	&& apt-get -y update \
 	&& apt-get -y install nginx-devportal nginx-devportal-ui \
-	&& echo 'DB_TYPE="sqlite"' | tee -a /etc/nginx-devportal/devportal.conf \
-	&& echo 'DB_PATH="/var/lib/nginx-devportal"' | tee -a /etc/nginx-devportal/devportal.conf; fi \
+	&& echo 'DB_TYPE="sqlite"' >> /etc/nginx-devportal/devportal.conf \
+	&& echo 'DB_PATH="/var/lib/nginx-devportal"' >> /etc/nginx-devportal/devportal.conf; fi \
 
 # Forward request logs to Docker log collector
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \

nginx-agent-docker/README.md

@@ -79,6 +79,7 @@ the build script will push the image to your private registry once build is comp
   - `NIM_TAGS` - comma separated list of tags for the NGINX Kubernetes Deployment
   - `NAP_WAF` - set to `"true"` to enable NGINX App Protect WAF (docker image built using `-w`)
   - `NAP_WAF_PRECOMPILED_POLICIES` - set to `"true"` to enable NGINX App Protect WAF precompiled policies (docker image built using `-w`)
+  - `ACM_DEVPORTAL` - set to `"true"` to enable API Connectivity Manager Developer Portal (docker image built using `-d`)
 
 2. Start and stop using