Merge remote-tracking branch 'ronlut/master' into ronlut

README.md

@@ -149,6 +149,26 @@ ENV NGINX_WORKER_PROCESSES auto
 COPY ./app /app
 ```
 
+## Custom Nginx maximum connections per worker setting
+
+By default, Nginx will start with a maximum limit of 1024 connections per worker.
+
+If you want to set a different number you can use the environment variable `NGINX_WORKER_CONNECTIONS`, e.g:
+
+```Dockerfile
+ENV NGINX_WORKER_CONNECTIONS 2048
+```
+
+## Custom Nginx maximum open files setting
+
+Nginx workers are limited by the system with regard to the maximum open file descriptors.
+
+If you want to change the limit you can use the environment variable `NGINX_WORKER_OPEN_FILES`, e.g.:
+
+```Dockerfile
+ENV NGINX_WORKER_OPEN_FILES 2048
+```
+
 ## What's new
 
 <!-- 

python2.7-alpine3.7/entrypoint.sh

@@ -15,6 +15,16 @@ USE_NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Modify the number of worker processes in Nginx config
 sed -i "/worker_processes\s/c\worker_processes ${USE_NGINX_WORKER_PROCESSES};" /etc/nginx/nginx.conf
 
+# Set the max number of connections per worker for Nginx, if requested
+if [[ -v NGINX_WORKER_CONNECTIONS ]] ; then
+    sed -i "/worker_connections\s/c\    worker_connections ${NGINX_WORKER_CONNECTIONS};" /etc/nginx/nginx.conf
+fi
+
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [[ -v NGINX_WORKER_OPEN_FILES ]] ; then
+    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
+fi
+
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 # Modify Nginx config for listen port

python2.7/entrypoint.sh

@@ -11,6 +11,16 @@ USE_NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Modify the number of worker processes in Nginx config
 sed -i "/worker_processes\s/c\worker_processes ${USE_NGINX_WORKER_PROCESSES};" /etc/nginx/nginx.conf
 
+# Set the max number of connections per worker for Nginx, if requested
+if [[ -v NGINX_WORKER_CONNECTIONS ]] ; then
+    sed -i "/worker_connections\s/c\    worker_connections ${NGINX_WORKER_CONNECTIONS};" /etc/nginx/nginx.conf
+fi
+
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [[ -v NGINX_WORKER_OPEN_FILES ]] ; then
+    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
+fi
+
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 # Modify Nignx config for listen port

python3.5/entrypoint.sh

@@ -11,6 +11,16 @@ USE_NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Modify the number of worker processes in Nginx config
 sed -i "/worker_processes\s/c\worker_processes ${USE_NGINX_WORKER_PROCESSES};" /etc/nginx/nginx.conf
 
+# Set the max number of connections per worker for Nginx, if requested
+if [[ -v NGINX_WORKER_CONNECTIONS ]] ; then
+    sed -i "/worker_connections\s/c\    worker_connections ${NGINX_WORKER_CONNECTIONS};" /etc/nginx/nginx.conf
+fi
+
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [[ -v NGINX_WORKER_OPEN_FILES ]] ; then
+    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
+fi
+
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 # Modify Nignx config for listen port

python3.6-alpine3.7/entrypoint.sh

@@ -15,6 +15,16 @@ USE_NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Modify the number of worker processes in Nginx config
 sed -i "/worker_processes\s/c\worker_processes ${USE_NGINX_WORKER_PROCESSES};" /etc/nginx/nginx.conf
 
+# Set the max number of connections per worker for Nginx, if requested
+if [[ -v NGINX_WORKER_CONNECTIONS ]] ; then
+    sed -i "/worker_connections\s/c\    worker_connections ${NGINX_WORKER_CONNECTIONS};" /etc/nginx/nginx.conf
+fi
+
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [[ -v NGINX_WORKER_OPEN_FILES ]] ; then
+    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
+fi
+
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 # Modify Nignx config for listen port

python3.6/entrypoint.sh

@@ -11,6 +11,16 @@ USE_NGINX_WORKER_PROCESSES=${NGINX_WORKER_PROCESSES:-1}
 # Modify the number of worker processes in Nginx config
 sed -i "/worker_processes\s/c\worker_processes ${USE_NGINX_WORKER_PROCESSES};" /etc/nginx/nginx.conf
 
+# Set the max number of connections per worker for Nginx, if requested
+if [[ -v NGINX_WORKER_CONNECTIONS ]] ; then
+    sed -i "/worker_connections\s/c\    worker_connections ${NGINX_WORKER_CONNECTIONS};" /etc/nginx/nginx.conf
+fi
+
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [[ -v NGINX_WORKER_OPEN_FILES ]] ; then
+    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
+fi
+
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 # Modify Nignx config for listen port