Merge pull request #26 from devilbox/release-0.30

Be able to customise worker connections and worker processes

Author: cytopia

README.md

@@ -116,6 +116,13 @@ This Docker container adds a lot of injectables in order to customize it to your
 
 `PHP_FPM_SERVER_ADDR` is required when enabling PHP FPM.
 
+##### Optional environmental variables (nginx)
+
+| Variable | Type | Default | Description |
+|----------|------|---------|-------------|
+| WORKER_CONNECTIONS | int    | `1024`    | [worker_connections](https://nginx.org/en/docs/ngx_core_module.html#worker_connections) |
+| WORKER_PROCESSES   | int or `auto` | `auto`  | [worker_processes](https://nginx.org/en/docs/ngx_core_module.html#worker_processes) |
+
 ##### Optional environmental variables (general)
 
 | Variable | Type | Default | Description |

data/docker-entrypoint.d/10-config-settings.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+
+############################################################
+# Functions
+############################################################
+
+###
+### Change worker_processes
+###
+set_worker_processess() {
+	local wp_varname="${1}"
+	local debug="${2}"
+	local default="auto"
+	local config="/etc/nginx/nginx.conf"
+
+	if ! env_set "${wp_varname}"; then
+		log "info" "\$${wp_varname} not set. Keeping default worker_processes: '${default}'." "${debug}"
+		run "sed -i'' 's/__WORKER_PROCESSES__/${default}/g' ${config}" "${debug}"
+	else
+		wp="$( env_get "${wp_varname}" )"
+
+		if [ "${wp}" = "auto" ]; then
+			log "info" "\$${wp_varname} set to its default value: '${default}'." "${debug}"
+			run "sed -i'' 's/__WORKER_PROCESSES__/${default}/g' ${config}" "${debug}"
+		else
+			if ! isint "${wp}"; then
+				log "err" "\$${wp_varname} is not an integer: '${wp}'" "${debug}"
+				exit 1
+			else
+				log "info" "Setting worker_processes to: ${wp}" "${debug}"
+				run "sed -i'' 's/__WORKER_PROCESSES__/${wp}/g' ${config}" "${debug}"
+			fi
+		fi
+	fi
+}
+
+
+###
+### Change worker_connections
+###
+set_worker_connections() {
+	local wc_varname="${1}"
+	local debug="${2}"
+	local default="1024"
+	local config="/etc/nginx/nginx.conf"
+
+	if ! env_set "${wc_varname}"; then
+		log "info" "\$${wc_varname} not set. Keeping default worker_connections: '${default}'." "${debug}"
+		run "sed -i'' 's/__WORKER_CONNECTIONS__/${default}/g' ${config}" "${debug}"
+	else
+		wc="$( env_get "${wc_varname}" )"
+
+		if ! isint "${wc}"; then
+			log "err" "\$${wc_varname} is not an integer: '${wc}'" "${debug}"
+			exit 1
+		else
+			log "info" "Setting worker_connections to: ${wc}" "${debug}"
+			run "sed -i'' 's/__WORKER_CONNECTIONS__/${wc}/g' ${config}" "${debug}"
+		fi
+	fi
+}

data/docker-entrypoint.d/10-supervisord.sh renamed to data/docker-entrypoint.d/11-supervisord.sh

@@ -67,6 +67,12 @@ set_gid "NEW_GID" "${MY_GROUP}" "${DEBUG_LEVEL}"
 set_timezone "TIMEZONE" "${DEBUG_LEVEL}"
 
 
+###
+### Nginx settings
+###
+set_worker_processess "WORKER_PROCESSES" "${DEBUG_LEVEL}"
+set_worker_connections "WORKER_CONNECTIONS" "${DEBUG_LEVEL}"
+
 
 #############################################################
 ## Variable exports

data/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 # MAIN SETTINGS
 # =================================================================================================
 
-worker_processes  auto;
+worker_processes  __WORKER_PROCESSES__;
 
 user   nginx;
 daemon off;
@@ -11,7 +11,7 @@ error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
 events {
-    worker_connections  1024;
+    worker_connections  __WORKER_CONNECTIONS__;
 }