Merge pull request #17 from devilbox/release-0.21

Release 0.21

Author: cytopia

Dockerfile

@@ -10,7 +10,7 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=0.11
+ARG VHOST_GEN_GIT_REF=0.12
 ARG CERT_GEN_GIT_REF=0.2
 
 ENV BUILD_DEPS \

README.md

@@ -127,6 +127,7 @@ This Docker container adds a lot of injectables in order to customize it to your
 | PHP_FPM_ENABLE      | bool   | `0`     | Enable PHP-FPM for the default vhost and the mass virtual hosts. |
 | PHP_FPM_SERVER_ADDR | string | ``      | IP address or hostname of remote PHP-FPM server.<br/><strong>Required when enabling PHP.</strong> |
 | PHP_FPM_SERVER_PORT | int    | `9000`  | Port of remote PHP-FPM server |
+| PHP_FPM_TIMEOUT     | int    | `180`   | Timeout in seconds to upstream PHP-FPM server |
 
 ##### Optional environmental variables (default vhost)
 

data/docker-entrypoint.d/04-php-fpm.sh

@@ -96,3 +96,38 @@ export_php_fpm_server_port() {
 	# Ensure variable is exported if not set
 	eval "export ${varname}=${value}"
 }
+
+
+###
+### Ensure PHP_FPM_TIMEOUT is set (if needed)
+###
+export_php_fpm_timeout() {
+	local varname="${1}"
+	local debug="${2}"
+	local value="180"
+
+	if [ "${PHP_FPM_ENABLE}" = "1" ]; then
+		if ! env_set "${varname}"; then
+			log "info" "\$${varname} not specified, keeping default: ${value}" "${debug}"
+		else
+			value="$( env_get "${varname}" )"
+
+			if [ -z "${value}" ]; then
+				log "err" "\$${varname} is empty." "${debug}"
+				exit 1
+			fi
+			if ! isint "${value}"; then
+				log "err" "\$${varname} is not a valid integer: ${value}" "${debug}"
+				exit 1
+			fi
+			if [ "${value}" -lt "0" ]; then
+				log "err" "\$${varname} must be greater than 0: ${value}" "${debug}"
+				exit 1
+			fi
+			log "info" "PHP-FPM: Timeout: ${value}" "${debug}"
+		fi
+	fi
+
+	# Ensure variable is exported if not set
+	eval "export ${varname}=${value}"
+}

data/docker-entrypoint.d/07-vhost-gen.sh

@@ -16,13 +16,15 @@ vhost_gen_php_fpm() {
 	local enable="${1}"
 	local addr="${2}"
 	local port="${3}"
-	local config="${4}"
-	local debug="${5}"
+	local timeout="${4}"
+	local config="${5}"
+	local debug="${6}"
 
 	if [ "${enable}" -eq "1" ]; then
 		run "sed -i'' 's/__PHP_ENABLE__/yes/g' ${config}" "${debug}"
 		run "sed -i'' 's/__PHP_ADDR__/${addr}/g' ${config}" "${debug}"
 		run "sed -i'' 's/__PHP_PORT__/${port}/g' ${config}" "${debug}"
+		run "sed -i'' 's/__PHP_TIMEOUT__/${timeout}/g' ${config}" "${debug}"
 	else
 		run "sed -i'' 's/__PHP_ENABLE__/no/g' ${config}" "${debug}"
 	fi

data/docker-entrypoint.sh

@@ -82,6 +82,7 @@ export_docker_logs "DOCKER_LOGS" "${DEBUG_LEVEL}"
 export_php_fpm_enable "PHP_FPM_ENABLE" "${DEBUG_LEVEL}"
 export_php_fpm_server_addr "PHP_FPM_SERVER_ADDR" "${DEBUG_LEVEL}"
 export_php_fpm_server_port "PHP_FPM_SERVER_PORT" "${DEBUG_LEVEL}"
+export_php_fpm_timeout "PHP_FPM_TIMEOUT" "${DEBUG_LEVEL}"
 
 
 ###
@@ -125,8 +126,8 @@ fi
 ###
 ### Enable and configure PHP-FPM
 ###
-vhost_gen_php_fpm "${PHP_FPM_ENABLE}" "${PHP_FPM_SERVER_ADDR}" "${PHP_FPM_SERVER_PORT}" "/etc/vhost-gen/main.yml" "${DEBUG_LEVEL}"
-vhost_gen_php_fpm "${PHP_FPM_ENABLE}" "${PHP_FPM_SERVER_ADDR}" "${PHP_FPM_SERVER_PORT}" "/etc/vhost-gen/mass.yml" "${DEBUG_LEVEL}"
+vhost_gen_php_fpm "${PHP_FPM_ENABLE}" "${PHP_FPM_SERVER_ADDR}" "${PHP_FPM_SERVER_PORT}" "${PHP_FPM_TIMEOUT}" "/etc/vhost-gen/main.yml" "${DEBUG_LEVEL}"
+vhost_gen_php_fpm "${PHP_FPM_ENABLE}" "${PHP_FPM_SERVER_ADDR}" "${PHP_FPM_SERVER_PORT}" "${PHP_FPM_TIMEOUT}" "/etc/vhost-gen/mass.yml" "${DEBUG_LEVEL}"
 
 
 ###

data/vhost-gen/main.yml

@@ -138,6 +138,8 @@ vhost:
     # Hostname or IP address
     address: __PHP_ADDR__
     port: __PHP_PORT__
+    # Timeout to upstream FPM service
+    timeout: __PHP_TIMEOUT__
   # Create additional aliases
   alias:
     - alias: /devilbox-api/

data/vhost-gen/mass.yml

@@ -138,6 +138,8 @@ vhost:
     # Hostname or IP address
     address: __PHP_ADDR__
     port: __PHP_PORT__
+    # Timeout to upstream FPM service
+    timeout: __PHP_TIMEOUT__
   # Create additional aliases
   alias:
     - alias: /devilbox-api/