From a3d037c6acb2daca830f6518c3344e95a2c1d71b Mon Sep 17 00:00:00 2001 From: Sean Breen Date: Mon, 14 Jul 2025 16:44:11 +0100 Subject: [PATCH 1/2] add check for nginx pid file --- test/docker/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/docker/entrypoint.sh b/test/docker/entrypoint.sh index 24b82bc04..5c88412d2 100644 --- a/test/docker/entrypoint.sh +++ b/test/docker/entrypoint.sh @@ -33,13 +33,14 @@ echo "starting nginx ..." nginx_pid=$! SECONDS=0 - -while ! ps -ef | grep "nginx: master process" | grep -v grep; do +while [[ ! -f /var/run/nginx.pid ]]; do if (( SECONDS > 30 )); then echo "couldn't find nginx master process" exit 1 + sleep 1 fi done +nginx_pid=$(cat /var/run/nginx.pid) cat /etc/nginx-agent/nginx-agent.conf; From 47034b07819128a9d2983f5a963b8b2dbfd25ea9 Mon Sep 17 00:00:00 2001 From: Sean Breen Date: Tue, 15 Jul 2025 14:52:18 +0100 Subject: [PATCH 2/2] add alpine default path /var/run/nginx/nginx.pid --- test/docker/entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/docker/entrypoint.sh b/test/docker/entrypoint.sh index 5c88412d2..890d90154 100644 --- a/test/docker/entrypoint.sh +++ b/test/docker/entrypoint.sh @@ -33,14 +33,13 @@ echo "starting nginx ..." nginx_pid=$! SECONDS=0 -while [[ ! -f /var/run/nginx.pid ]]; do +while [[ ! -f /var/run/nginx.pid ]] && [[ ! -f /var/run/nginx/nginx.pid ]]; do if (( SECONDS > 30 )); then echo "couldn't find nginx master process" exit 1 - sleep 1 fi + sleep 1 done -nginx_pid=$(cat /var/run/nginx.pid) cat /etc/nginx-agent/nginx-agent.conf;