From d8a4ed92a0d1957c65f3240194bc1d6ef18f648f Mon Sep 17 00:00:00 2001 From: Daniel Edgar Date: Thu, 13 Mar 2025 09:32:43 -0400 Subject: [PATCH 1/2] switch to JSON args to resolve docker build warnings --- NGINX-Docker-Image-Builder/Dockerfile.oss | 2 +- NGINX-Docker-Image-Builder/Dockerfile.plus | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NGINX-Docker-Image-Builder/Dockerfile.oss b/NGINX-Docker-Image-Builder/Dockerfile.oss index 5fb02e7..c0cb223 100644 --- a/NGINX-Docker-Image-Builder/Dockerfile.oss +++ b/NGINX-Docker-Image-Builder/Dockerfile.oss @@ -31,4 +31,4 @@ RUN chmod +x /deployment/start.sh && touch /.dockerenv EXPOSE 80 STOPSIGNAL SIGTERM -CMD /deployment/start.sh +CMD ["/deployment/start.sh"] diff --git a/NGINX-Docker-Image-Builder/Dockerfile.plus b/NGINX-Docker-Image-Builder/Dockerfile.plus index 3da82d4..a30b7f6 100644 --- a/NGINX-Docker-Image-Builder/Dockerfile.plus +++ b/NGINX-Docker-Image-Builder/Dockerfile.plus @@ -46,4 +46,4 @@ RUN chmod +x /deployment/start.sh && touch /.dockerenv EXPOSE 80 STOPSIGNAL SIGTERM -CMD /deployment/start.sh +CMD ["/deployment/start.sh"] From 5c194b3cdf2966b76e4358b007c5bc0101216be4 Mon Sep 17 00:00:00 2001 From: Daniel Edgar Date: Thu, 13 Mar 2025 09:33:04 -0400 Subject: [PATCH 2/2] explicitly set arch for NAP WAF builds for when building from ARM systems --- NGINX-Docker-Image-Builder/scripts/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NGINX-Docker-Image-Builder/scripts/build.sh b/NGINX-Docker-Image-Builder/scripts/build.sh index bc109e1..c6cb616 100755 --- a/NGINX-Docker-Image-Builder/scripts/build.sh +++ b/NGINX-Docker-Image-Builder/scripts/build.sh @@ -87,6 +87,7 @@ fi if ([ ! -z "${NAP_WAF}" ] && [ -z "${NGINX_OSS}" ]) then echo "=> Building with NGINX App Protect WAF" + OPT_PLATFORM="--platform linux/amd64" # for NGINX App Protect WAF, which is only available for x86_64 fi if [ -z "${NGINX_OSS}" ] @@ -103,6 +104,7 @@ then DOCKER_BUILDKIT=1 docker build --no-cache -f $DOCKERFILE_NAME \ --secret id=nginx-key,src=$NGINX_KEY --secret id=nginx-crt,src=$NGINX_CERT \ --build-arg NAP_WAF=$NAP_WAF --build-arg NGINX_AGENT=$NGINX_AGENT \ + $OPT_PLATFORM \ -t $IMAGENAME . else echo "=> Building with NGINX Open Source"