Better handling of signals, track process failurs. Add support of custom dir

Author: makasim

README.md

@@ -1 +1,12 @@
 # docker-nginx-php-fpm
+
+## Usage
+
+Let's say you have `/home/user/app/web` folder which web root of your project. 
+If the file physically exists on filesystem it is served by nginx. 
+If file not present Nginx proxy a request to PHP-FPM.
+There must be a `app.php` inside the folder.
+
+```
+docker run --rm -it --env CUSTOM_DIR=/app/web -p 80:80 -v /home/user/app/:/app makasim/nginx-php-fpm
+```

entrypoint.sh

@@ -1,8 +1,49 @@
 #!/usr/bin/env bash
 
-nginx -c /etc/nginx/nginx.conf  -g 'daemon off;' 2>&1 &
-php-fpm7.0 -R -F -c /etc/php/7.0/fpm/php-fpm.conf 2>&1 &
+TRAPPED_SIGNAL=false
 
-trap "kill -15 %1; kill -15 %2; wait %1 %2;" SIGTERM  SIGINT
+if [ -d $CUSTOM_DIR ]; then
+echo 'Custom dir setup'
+    rm -rf /var/www/html;
+    cd /var/www && ln -s $CUSTOM_DIR html
+fi
 
-wait %2
+echo 'Starting NGINX';
+nginx -c ${NGINX_CONF:-/etc/nginx/nginx.conf}  -g 'daemon off;' 2>&1 &
+NGINX_PID=$!
+
+echo 'Starting PHP-FPM';
+php-fpm7.0 -R -F -c ${PHP_FPM_CONF:-/etc/php/7.0/fpm/php-fpm.conf} 2>&1 &
+PHP_FPM_PID=$!
+
+trap "TRAPPED_SIGNAL=true; kill -15 $NGINX_PID; kill -15 $PHP_FPM_PID;" SIGTERM  SIGINT
+
+while :
+do
+    kill -0 $NGINX_PID 2> /dev/null
+    NGINX_STATUS=$?
+
+    kill -0 $PHP_FPM_PID 2> /dev/null
+    PHP_FPM_STATUS=$?
+
+    if [ "$TRAPPED_SIGNAL" = "false" ]; then
+        if [ $NGINX_STATUS -ne 0 ] || [ $PHP_FPM_STATUS -ne 0 ]; then
+            if [ $NGINX_STATUS -eq 0 ]; then
+                kill -15 $NGINX_PID;
+                wait $NGINX_PID;
+            fi
+            if [ $PHP_FPM_STATUS -eq 0 ]; then
+                kill -15 $PHP_FPM_PID;
+                wait $PHP_FPM_PID;
+            fi
+
+            exit 1;
+        fi
+    else
+       if [ $NGINX_STATUS -ne 0 ] && [ $PHP_FPM_STATUS -ne 0 ]; then
+            exit 0;
+       fi
+    fi
+
+	sleep 1
+done