Merge pull request #208 from jdeathe/issue/193

CLOSES #193: Adds php-wrapper and the httpd configuration to implement it.

Author: jdeathe

CHANGELOG.md

@@ -13,6 +13,7 @@ Summary of release changes.
 - Updates README-short.txt to apply to all image variants.
 - Updates Dockerfile `org.deathe.description` metadata LABEL for consistency + include PHP redis module.
 - Adds `.env` files to `.gitignore` for exclusion from version control.
+- Adds `php-wrapper` and `fcgid.conf` as part of the service; removing dependency on the php-hello-world app.
 - Removes unused `DOCKER_PORT_MAP_TCP_22` variable from environment includes.
 
 ### 1.12.0 - 2019-04-14

Dockerfile

@@ -25,14 +25,13 @@ ADD src /
 
 # ------------------------------------------------------------------------------
 # Provisioning
-# - Relocate default fcgid configuration to ensure correct loading order
+# - Disable Apache default fcgid configuration; replaced with 00-fcgid.conf
 # - Replace placeholders with values in systemd service unit template
 # - Set permissions
 # ------------------------------------------------------------------------------
-RUN cat \
+RUN truncate -s 0 \
 		/etc/httpd/conf.d/fcgid.conf \
-		> /etc/httpd/conf.d/00-fcgid.conf \
-	&& truncate -s 0 \
+	&& chmod 444 \
 		/etc/httpd/conf.d/fcgid.conf \
 	&& sed -i \
 		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
@@ -44,9 +43,9 @@ RUN cat \
 RUN sed -i \
 		-e 's~^description =.*$~description = "This CentOS / Apache / PHP-CGI (FastCGI) service is running in a container."~' \
 		${PACKAGE_PATH}/etc/views/index.ini \
-	&& sed -r -i \
-		-e 's~^(source /etc/httpd-bootstrap\.conf)~#\1~' \
-		${PACKAGE_PATH}/bin/php-wrapper
+	&& rm -f \
+		${PACKAGE_PATH}/bin/php-wrapper \
+		${PACKAGE_PATH}/etc/httpd/conf.d/50-fcgid.conf
 
 # ------------------------------------------------------------------------------
 # Set default environment variables used to configure the service container

src/etc/httpd/conf.d/00-fcgid.conf

@@ -0,0 +1,25 @@
+<IfModule !fcgid_module>
+    LoadModule fcgid_module modules/mod_fcgid.so
+</IfModule>
+
+<IfModule fcgid_module>
+    AddHandler fcgid-script php
+    AddType text/html php
+    DirectoryIndex index.php
+    FcgidFixPathinfo 1
+    FcgidIOTimeout 360
+    FcgidIPCDir /var/run/mod_fcgid
+    FcgidIdleTimeout 1800
+    FcgidMaxProcesses 10
+    FcgidMaxRequestLen 157286400
+    FcgidMaxRequestsPerProcess 10000
+    FcgidPassHeader Authorization
+    FcgidProcessTableFile /var/run/mod_fcgid/fcgid_shm
+
+    <Directory "${APACHE_CONTENT_ROOT}/${APACHE_PUBLIC_DIRECTORY}">
+        FcgidWrapper "/var/www/cgi-bin/php-wrapper --tmp=${APACHE_CONTENT_ROOT}/var/tmp" .php
+        <FilesMatch "\.php$">
+            Options +ExecCGI
+        </FilesMatch>
+    </Directory>
+</IfModule>

src/var/www/cgi-bin/php-wrapper

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+function main ()
+{
+	local -r bin="/usr/bin/php-cgi"
+	local -r nice="/bin/nice"
+	local -r niceness="15"
+
+	local bin_options
+	local option
+	local -a options
+	local tmp="/var/tmp"
+
+	while [[ "${#}" -gt 0 ]]
+	do
+		case "${1}" in
+			-d)
+				options+=("${2}")
+				shift 2
+				;;
+			--tmp=*)
+				tmp="${1#*=}"
+				shift 1
+				;;
+		esac
+	done
+
+	if [[ ${#options[@]} -gt 0 ]]
+	then
+		for option in "${options[@]}"
+		do
+			bin_options+=" -d ${option}"
+		done
+	fi
+
+	export PHP_FCGI_CHILDREN="0"
+	export PHP_FCGI_MAX_REQUESTS="15000"
+	export PHPRC="/etc"
+	export REDIRECT_STATUS="200"
+	export TMP="${tmp}"
+	export TEMP="${tmp}"
+	export TMPDIR="${tmp}"
+
+	exec ${nice} \
+		-n ${niceness} \
+		${bin} \
+		${bin_options}
+}
+
+main "${@}"