From: William Desportes <redacted>
Date: Wed, 18 Aug 2021 16:33:46 +0000 (+0200)
Subject: Use another method to check PHP FPM health
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=55bc178488cdfe1fa3e1bc97dd76a5a11ae32280;p=roundcube-roundcubemail-docker.git

Use another method to check PHP FPM health
---

diff --git a/tests/docker-compose.test-fpm-postgres.yml b/tests/docker-compose.test-fpm-postgres.yml
index 94b52ca..638853b 100644
--- a/tests/docker-compose.test-fpm-postgres.yml
+++ b/tests/docker-compose.test-fpm-postgres.yml
@@ -5,7 +5,9 @@ services:
     image: ${ROUNDCUBEMAIL_TEST_IMAGE:-roundcube-test-fpm}
     healthcheck:
       # Check until the FPM port is in in the LISTEN list
-      test: ["CMD-SHELL", "netstat -an | grep -q -F \":9000\""]
+      # test: ["CMD-SHELL", "netstat -an | grep -q -F \":9000\""]
+      # Or use php to test php since the non alpine fpm image has no binary able to know if a port is in listen mode
+      test: ["CMD-SHELL", "php -r '$$c = @fsockopen(\"localhost\", 9000); if (is_resource($$c)) { fwrite(STDOUT, \"OK\"); fclose($$c); exit(0); } else { fwrite(STDERR, \"FAIL\"); exit(1); }'"]
       interval: 2s
       timeout: 3s
       retries: 30