Merge pull request #2 from bryanlatten/feature-server-options

Dockerfile/run: allowing changes via env vars

Author: Bryan Latten

Dockerfile

@@ -3,6 +3,7 @@ MAINTAINER Bryan Latten <[email protected]>
 
 # Install pre-reqs, security updates
 RUN apt-get update && \
+    apt-get upgrade -yq && \
     apt-get -yq install \
         openssl=1.0.1f-1ubuntu2.15 \
         ca-certificates=20141019ubuntu0.14.04.1 \

README.md

@@ -1,2 +1,8 @@
 # docker-nginx
 Provides base OS, patches and stable nginx for quick and easy spinup
+
+
+Variable | Example | Description
+--- | --- | ---
+`SERVER_MAX_BODY_SIZE` | `SERVER_MAX_BODY_SIZE=4M` | Allows the downstream application to specify a non-default `client_max_body_size` configuration for the `server`-level directive in `/etc/nginx/sites-available/default`
+`SERVER_INDEX` | `SERVER_INDEX index.html index.html index.php | Changes the default pages to hit for folder and web roots

container/root/etc/nginx/sites-available/default

@@ -1,13 +1,17 @@
+# NOTE: the syntax in most directives is sadly duplicated in run.sh,
+# in order to replace at runtime with `sed`, therefore, check for changes in both places
 server {
   listen 80;
 
   server_tokens off; # Doesn't broadcast version level of server software
-  server_name web; # TODO: replace with environment variable
 
+  # Replace with env variable SERVER_INDEX
   index index.html index.htm;
 
+  # Replace with env variable SERVER_MAX_BODY_SIZE
+  client_max_body_size 1m;
+
   location / {
-    # Check for file or folder first, otherwise rewrite to front controller
     try_files $uri $uri/ =404;
   }
 

container/root/run.sh

@@ -1,14 +1,29 @@
 #!/bin/bash
+CONFIG_SITE=/etc/nginx/sites-available/default
+CONFIG_SERVER=/etc/nginx/nginx.conf
 
-echo 'Setting sensible nginx defaults'
+echo '[nginx] setting sensible defaults'
 
 # Configure nginx to use as many workers as there are cores for the running container
-sed -i "s/worker_processes [0-9]\+/worker_processes $(nproc)/" /etc/nginx/nginx.conf
-sed -i "s/worker_connections [0-9]\+/worker_connections 1024/" /etc/nginx/nginx.conf
+sed -i "s/worker_processes [0-9]\+/worker_processes $(nproc)/" $CONFIG_SERVER
+sed -i "s/worker_connections [0-9]\+/worker_connections 1024/" $CONFIG_SERVER
 
-# Ensure nginx is configured to write logs to STDOUT
-sed -i "s/access_log [a-z\/\.\;]\+/access_log \/dev\/stdout;/" /etc/nginx/nginx.conf
-sed -i "s/error_log [a-z\/\.\ \;]\+/error_log \/dev\/stdout info;/" /etc/nginx/nginx.conf
+echo '[nginx] piping logs to STDOUT'
 
-echo "Starting Nginx (foreground)"
+sed -i "s/access_log [a-z\/\.\;]\+/access_log \/dev\/stdout;/" $CONFIG_SERVER
+sed -i "s/error_log [a-z\/\.\ \;]\+/error_log \/dev\/stdout info;/" $CONFIG_SERVER
+
+if [[ $SERVER_MAX_BODY_SIZE ]]
+then
+  echo "[nginx] server client max body is ${SERVER_MAX_BODY_SIZE}"
+  sed -i "s/client_max_body_size 1m/client_max_body_size ${SERVER_MAX_BODY_SIZE}/" $CONFIG_SITE
+fi
+
+if [[ $SERVER_INDEX ]]
+then
+  echo "[nginx] server index is ${SERVER_INDEX}"
+  sed -i "s/index index.html index.htm/index ${SERVER_INDEX}/" $CONFIG_SITE
+fi
+
+echo "[nginx] starting (foreground)"
 exec /usr/sbin/nginx -g "daemon off;"