Add Readiness Checks

dist/7.4/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/7.4/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/notification-fd

@@ -0,0 +1 @@
+3

dist/7.4/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/run

@@ -1,2 +1,4 @@
-#!/command/with-contenv bash
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck
 /usr/sbin/apache2ctl -DFOREGROUND

dist/7.4/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/7.4/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/notification-fd

@@ -0,0 +1 @@
+3

dist/7.4/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/run

@@ -1,2 +1,4 @@
-#!/command/execlineb
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck
 nginx

dist/7.4/fpm/Dockerfile

@@ -31,9 +31,12 @@ ENV PHP_DATE_TIMEZONE="UTC" \
 # Install FPM
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-        php7.4-fpm \
-        && echo "Allow pool name to be set via env, default it to 'www'..." \
+        php7.4-fpm libfcgi-bin\
+    && echo "Allow pool name to be set via env, default it to 'www'..." \
     && sed -i -e 's/\[www\]/\[$\{PHP_POOL_NAME\}]/g' /etc/php/7.4/fpm/pool.d/www.conf \
+    && echo "Install PHP-FPM Healthcheck script..." \
+    && wget -O /usr/local/bin/php-fpm-healthcheck https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck \
+    && chmod +x /usr/local/bin/php-fpm-healthcheck \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

dist/7.4/fpm/etc/php/fpm/pool.d/y-override-php-defaults.conf

@@ -195,7 +195,7 @@ pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
 ;       anything, but it may not be a good idea to use the .php extension or it
 ;       may conflict with a real PHP file.
 ; Default Value: not set
-;pm.status_path = /status
+pm.status_path = /status
 
 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
 ; URI will be recognized as a ping page. This could be used to test from outside

dist/7.4/fpm/etc/s6-overlay/s6-rc.d/php-fpm/data/check

@@ -0,0 +1,2 @@
+#!/command/with-contenv bash
+FCGI_CONNECT=/var/run/php/php-fpm.sock php-fpm-healthcheck

dist/7.4/fpm/etc/s6-overlay/s6-rc.d/php-fpm/notification-fd

@@ -0,0 +1 @@
+3

dist/7.4/fpm/etc/s6-overlay/s6-rc.d/php-fpm/run

@@ -1,7 +1,4 @@
-#!/command/with-contenv bash
-
-# Switch to web user
-su webuser
-
-#Bring up PHP FPM
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck -d
 exec /usr/sbin/php-fpm7.4 --nodaemonize

dist/8.0/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/8.0/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/notification-fd

@@ -0,0 +1 @@
+3

dist/8.0/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/run

@@ -1,2 +1,4 @@
-#!/command/with-contenv bash
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck
 /usr/sbin/apache2ctl -DFOREGROUND

dist/8.0/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/8.0/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/notification-fd

@@ -0,0 +1 @@
+3

dist/8.0/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/run

@@ -1,2 +1,4 @@
-#!/command/execlineb
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck
 nginx

dist/8.0/fpm/Dockerfile

@@ -31,9 +31,12 @@ ENV PHP_DATE_TIMEZONE="UTC" \
 # Install FPM
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-        php8.0-fpm \
-        && echo "Allow pool name to be set via env, default it to 'www'..." \
+        php8.0-fpm libfcgi-bin\
+    && echo "Allow pool name to be set via env, default it to 'www'..." \
     && sed -i -e 's/\[www\]/\[$\{PHP_POOL_NAME\}]/g' /etc/php/8.0/fpm/pool.d/www.conf \
+    && echo "Install PHP-FPM Healthcheck script..." \
+    && wget -O /usr/local/bin/php-fpm-healthcheck https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck \
+    && chmod +x /usr/local/bin/php-fpm-healthcheck \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

dist/8.0/fpm/etc/php/fpm/pool.d/y-override-php-defaults.conf

@@ -195,7 +195,7 @@ pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
 ;       anything, but it may not be a good idea to use the .php extension or it
 ;       may conflict with a real PHP file.
 ; Default Value: not set
-;pm.status_path = /status
+pm.status_path = /status
 
 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
 ; URI will be recognized as a ping page. This could be used to test from outside

dist/8.0/fpm/etc/s6-overlay/s6-rc.d/php-fpm/data/check

@@ -0,0 +1,2 @@
+#!/command/with-contenv bash
+FCGI_CONNECT=/var/run/php/php-fpm.sock php-fpm-healthcheck

dist/8.0/fpm/etc/s6-overlay/s6-rc.d/php-fpm/notification-fd

@@ -0,0 +1 @@
+3

dist/8.0/fpm/etc/s6-overlay/s6-rc.d/php-fpm/run

@@ -1,7 +1,4 @@
-#!/command/with-contenv bash
-
-# Switch to web user
-su webuser
-
-#Bring up PHP FPM
+#!/command/execlineb -P
+with-contenv
+s6-notifyoncheck -d
 exec /usr/sbin/php-fpm8.0 --nodaemonize

dist/8.1/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/8.1/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/notification-fd

@@ -0,0 +1 @@
+3

dist/8.1/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/run

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck
 /usr/sbin/apache2ctl -DFOREGROUND

dist/8.1/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

dist/8.1/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/notification-fd

@@ -0,0 +1 @@
+3

dist/8.1/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/run

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck
 nginx

dist/8.1/fpm/Dockerfile

@@ -31,9 +31,12 @@ ENV PHP_DATE_TIMEZONE="UTC" \
 # Install FPM
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-        php8.1-fpm \
-        && echo "Allow pool name to be set via env, default it to 'www'..." \
+        php8.1-fpm libfcgi-bin\
+    && echo "Allow pool name to be set via env, default it to 'www'..." \
     && sed -i -e 's/\[www\]/\[$\{PHP_POOL_NAME\}]/g' /etc/php/8.1/fpm/pool.d/www.conf \
+    && echo "Install PHP-FPM Healthcheck script..." \
+    && wget -O /usr/local/bin/php-fpm-healthcheck https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck \
+    && chmod +x /usr/local/bin/php-fpm-healthcheck \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

dist/8.1/fpm/etc/php/fpm/pool.d/y-override-php-defaults.conf

@@ -195,7 +195,7 @@ pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
 ;       anything, but it may not be a good idea to use the .php extension or it
 ;       may conflict with a real PHP file.
 ; Default Value: not set
-;pm.status_path = /status
+pm.status_path = /status
 
 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
 ; URI will be recognized as a ping page. This could be used to test from outside

dist/8.1/fpm/etc/s6-overlay/s6-rc.d/php-fpm/data/check

@@ -0,0 +1,2 @@
+#!/command/with-contenv bash
+FCGI_CONNECT=/var/run/php/php-fpm.sock php-fpm-healthcheck

dist/8.1/fpm/etc/s6-overlay/s6-rc.d/php-fpm/notification-fd

@@ -0,0 +1 @@
+3

dist/8.1/fpm/etc/s6-overlay/s6-rc.d/php-fpm/run

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck -d
 exec /usr/sbin/php-fpm8.1 --nodaemonize

src/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

src/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/notification-fd

@@ -0,0 +1 @@
+3

src/fpm-apache/etc/s6-overlay/s6-rc.d/apache2/run

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck
 /usr/sbin/apache2ctl -DFOREGROUND

src/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/data/check

@@ -0,0 +1,8 @@
+#!/command/with-contenv bash
+response=$(curl --silent http://localhost/ping)
+
+if [[ $response == "pong" ]]; then
+	exit 0
+else
+	exit 1
+fi

src/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/notification-fd

@@ -0,0 +1 @@
+3

src/fpm-nginx/etc/s6-overlay/s6-rc.d/nginx/run

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck
 nginx

src/fpm/Dockerfile.j2

@@ -30,9 +30,12 @@ ENV PHP_DATE_TIMEZONE="UTC" \
 # Install FPM
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-        php{{ php_version }}-fpm \
-        && echo "Allow pool name to be set via env, default it to 'www'..." \
+        php{{ php_version }}-fpm libfcgi-bin\
+    && echo "Allow pool name to be set via env, default it to 'www'..." \
     && sed -i -e 's/\[www\]/\[$\{PHP_POOL_NAME\}]/g' /etc/php/{{ php_version }}/fpm/pool.d/www.conf \
+    && echo "Install PHP-FPM Healthcheck script..." \
+    && wget -O /usr/local/bin/php-fpm-healthcheck https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck \
+    && chmod +x /usr/local/bin/php-fpm-healthcheck \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 

src/fpm/etc/php/fpm/pool.d/y-override-php-defaults.conf.j2

@@ -195,7 +195,7 @@ pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
 ;       anything, but it may not be a good idea to use the .php extension or it
 ;       may conflict with a real PHP file.
 ; Default Value: not set
-;pm.status_path = /status
+pm.status_path = /status
 
 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
 ; URI will be recognized as a ping page. This could be used to test from outside

src/fpm/etc/s6-overlay/s6-rc.d/php-fpm/data/check

@@ -0,0 +1,2 @@
+#!/command/with-contenv bash
+FCGI_CONNECT=/var/run/php/php-fpm.sock php-fpm-healthcheck

src/fpm/etc/s6-overlay/s6-rc.d/php-fpm/notification-fd

@@ -0,0 +1 @@
+3

src/fpm/etc/s6-overlay/s6-rc.d/php-fpm/run.j2

@@ -1,3 +1,4 @@
 #!/command/execlineb -P
 with-contenv
+s6-notifyoncheck -d
 exec /usr/sbin/php-fpm{{ php_version }} --nodaemonize