Merge pull request #121 from tiangolo/generate-nginx-from-entrypoint

Generate Nginx configs dynamically from entrypoint
tiangolo · Feb 2, 2019 · f95a593 · f95a593
2 parents 538c82e + 5089921
commit f95a593
Show file tree

Hide file tree

Showing 26 changed files with 553 additions and 784 deletions.
diff --git a/python2.7-alpine3.7/Dockerfile b/python2.7-alpine3.7/Dockerfile
@@ -4,19 +4,6 @@ LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 
 RUN pip install flask
 
-# By default, allow unlimited file sizes, modify it to limit the file sizes
-# To have a maximum of 1 MB (Nginx's default) change the line to:
-# ENV NGINX_MAX_UPLOAD 1m
-ENV NGINX_MAX_UPLOAD 0
-
-# By default, Nginx listens on port 80.
-# To modify this, change LISTEN_PORT environment variable.
-# (in a Dockerfile or with an option for `docker run`)
-ENV LISTEN_PORT 80
-
-# Which uWSGI .ini file should be used, to make it customizable
-ENV UWSGI_INI /app/uwsgi.ini
-
 # URL under which static (not modified by Python) files will be requested
 # They will be served by Nginx directly, without being handled by uWSGI
 ENV STATIC_URL /static
@@ -38,6 +25,8 @@ ENV PYTHONPATH=/app
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
 
+# Move the base entrypoint to reuse it
+RUN mv /entrypoint.sh /uwsgi-nginx-entrypoint.sh
 # Copy the entrypoint that will generate Nginx additional configs
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

diff --git a/python2.7-alpine3.7/entrypoint.sh b/python2.7-alpine3.7/entrypoint.sh
@@ -1,25 +1,11 @@
 #! /usr/bin/env sh
 set -e
-# Get the maximum upload file size for Nginx, default to 0: unlimited
-USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0}
-# Generate Nginx config for maximum upload file size
-echo "client_max_body_size $USE_NGINX_MAX_UPLOAD;" > /etc/nginx/conf.d/upload.conf
 
-# Get the number of workers for Nginx, default to 1
-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
+/uwsgi-nginx-entrypoint.sh
 
-# Set the max number of connections per worker for Nginx, if requested
-# Cannot exceed worker_rlimit_nofile, see NGINX_WORKER_OPEN_FILES below
-if [ -n "$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 [ -n "$NGINX_WORKER_OPEN_FILES" ] ; then
-    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
-fi
+# Explicitly add installed Python packages and uWSGI Python packages to PYTHONPATH
+# Otherwise uWSGI can't import Flask
+export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages
 
 # Get the URL for static files from the environment variable
 USE_STATIC_URL=${STATIC_URL:-'/static'}
@@ -28,31 +14,26 @@ USE_STATIC_PATH=${STATIC_PATH:-'/app/static'}
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 
-# Explicitly add installed Python packages and uWSGI Python packages to PYTHONPATH
-# Otherwise uWSGI can't import Flask
-export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages
-
-# Generate Nginx config first part using the environment variables
-echo "server {
-    listen ${USE_LISTEN_PORT};
-    location / {
-        try_files \$uri @app;
-    }
-    location @app {
-        include uwsgi_params;
-        uwsgi_pass unix:///tmp/uwsgi.sock;
-    }
-    location $USE_STATIC_URL {
-        alias $USE_STATIC_PATH;
-    }" > /etc/nginx/conf.d/nginx.conf
-
+content_server='server {\n'
+content_server=$content_server"    listen ${USE_LISTEN_PORT};\n"
+content_server=$content_server'    location / {\n'
+content_server=$content_server'        try_files $uri @app;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'    location @app {\n'
+content_server=$content_server'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server"    location $USE_STATIC_URL {\n"
+content_server=$content_server"        alias $USE_STATIC_PATH;\n"
+content_server=$content_server'    }\n'
 # If STATIC_INDEX is 1, serve / with /static/index.html directly (or the static URL configured)
-if [[ $STATIC_INDEX == 1 ]] ; then
-echo "    location = / {
-        index $USE_STATIC_URL/index.html;
-    }" >> /etc/nginx/conf.d/nginx.conf
+if [ "$STATIC_INDEX" = 1 ] ; then
+    content_server=$content_server'    location = / {\n'
+    content_server=$content_server"        index $USE_STATIC_URL/index.html;\n"
+    content_server=$content_server'    }\n'
 fi
-# Finish the Nginx config file
-echo "}" >> /etc/nginx/conf.d/nginx.conf
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
 
-exec "$@"
+exec "$@"
diff --git a/python2.7-alpine3.8/Dockerfile b/python2.7-alpine3.8/Dockerfile
@@ -4,19 +4,6 @@ LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 
 RUN pip install flask
 
-# By default, allow unlimited file sizes, modify it to limit the file sizes
-# To have a maximum of 1 MB (Nginx's default) change the line to:
-# ENV NGINX_MAX_UPLOAD 1m
-ENV NGINX_MAX_UPLOAD 0
-
-# By default, Nginx listens on port 80.
-# To modify this, change LISTEN_PORT environment variable.
-# (in a Dockerfile or with an option for `docker run`)
-ENV LISTEN_PORT 80
-
-# Which uWSGI .ini file should be used, to make it customizable
-ENV UWSGI_INI /app/uwsgi.ini
-
 # URL under which static (not modified by Python) files will be requested
 # They will be served by Nginx directly, without being handled by uWSGI
 ENV STATIC_URL /static
@@ -38,6 +25,8 @@ ENV PYTHONPATH=/app
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
 
+# Move the base entrypoint to reuse it
+RUN mv /entrypoint.sh /uwsgi-nginx-entrypoint.sh
 # Copy the entrypoint that will generate Nginx additional configs
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

diff --git a/python2.7-alpine3.8/entrypoint.sh b/python2.7-alpine3.8/entrypoint.sh
@@ -1,25 +1,11 @@
 #! /usr/bin/env sh
 set -e
-# Get the maximum upload file size for Nginx, default to 0: unlimited
-USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0}
-# Generate Nginx config for maximum upload file size
-echo "client_max_body_size $USE_NGINX_MAX_UPLOAD;" > /etc/nginx/conf.d/upload.conf
 
-# Get the number of workers for Nginx, default to 1
-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
+/uwsgi-nginx-entrypoint.sh
 
-# Set the max number of connections per worker for Nginx, if requested
-# Cannot exceed worker_rlimit_nofile, see NGINX_WORKER_OPEN_FILES below
-if [ -n "$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 [ -n "$NGINX_WORKER_OPEN_FILES" ] ; then
-    echo "worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};" >> /etc/nginx/nginx.conf
-fi
+# Explicitly add installed Python packages and uWSGI Python packages to PYTHONPATH
+# Otherwise uWSGI can't import Flask
+export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages
 
 # Get the URL for static files from the environment variable
 USE_STATIC_URL=${STATIC_URL:-'/static'}
@@ -28,31 +14,26 @@ USE_STATIC_PATH=${STATIC_PATH:-'/app/static'}
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 
-# Explicitly add installed Python packages and uWSGI Python packages to PYTHONPATH
-# Otherwise uWSGI can't import Flask
-export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages
-
-# Generate Nginx config first part using the environment variables
-echo "server {
-    listen ${USE_LISTEN_PORT};
-    location / {
-        try_files \$uri @app;
-    }
-    location @app {
-        include uwsgi_params;
-        uwsgi_pass unix:///tmp/uwsgi.sock;
-    }
-    location $USE_STATIC_URL {
-        alias $USE_STATIC_PATH;
-    }" > /etc/nginx/conf.d/nginx.conf
-
+content_server='server {\n'
+content_server=$content_server"    listen ${USE_LISTEN_PORT};\n"
+content_server=$content_server'    location / {\n'
+content_server=$content_server'        try_files $uri @app;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'    location @app {\n'
+content_server=$content_server'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server"    location $USE_STATIC_URL {\n"
+content_server=$content_server"        alias $USE_STATIC_PATH;\n"
+content_server=$content_server'    }\n'
 # If STATIC_INDEX is 1, serve / with /static/index.html directly (or the static URL configured)
-if [[ $STATIC_INDEX == 1 ]] ; then
-echo "    location = / {
-        index $USE_STATIC_URL/index.html;
-    }" >> /etc/nginx/conf.d/nginx.conf
+if [ "$STATIC_INDEX" = 1 ] ; then
+    content_server=$content_server'    location = / {\n'
+    content_server=$content_server"        index $USE_STATIC_URL/index.html;\n"
+    content_server=$content_server'    }\n'
 fi
-# Finish the Nginx config file
-echo "}" >> /etc/nginx/conf.d/nginx.conf
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
 
-exec "$@"
+exec "$@"
diff --git a/python2.7/Dockerfile b/python2.7/Dockerfile
@@ -4,19 +4,6 @@ LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 
 RUN pip install flask
 
-# By default, allow unlimited file sizes, modify it to limit the file sizes
-# To have a maximum of 1 MB (Nginx's default) change the line to:
-# ENV NGINX_MAX_UPLOAD 1m
-ENV NGINX_MAX_UPLOAD 0
-
-# By default, Nginx listens on port 80.
-# To modify this, change LISTEN_PORT environment variable.
-# (in a Dockerfile or with an option for `docker run`)
-ENV LISTEN_PORT 80
-
-# Which uWSGI .ini file should be used, to make it customizable
-ENV UWSGI_INI /app/uwsgi.ini
-
 # URL under which static (not modified by Python) files will be requested
 # They will be served by Nginx directly, without being handled by uWSGI
 ENV STATIC_URL /static
@@ -38,6 +25,8 @@ ENV PYTHONPATH=/app
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
 
+# Move the base entrypoint to reuse it
+RUN mv /entrypoint.sh /uwsgi-nginx-entrypoint.sh
 # Copy the entrypoint that will generate Nginx additional configs
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

diff --git a/python2.7/entrypoint.sh b/python2.7/entrypoint.sh
@@ -1,25 +1,7 @@
 #! /usr/bin/env bash
 set -e
-# Get the maximum upload file size for Nginx, default to 0: unlimited
-USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0}
-# Generate Nginx config for maximum upload file size
-echo "client_max_body_size $USE_NGINX_MAX_UPLOAD;" > /etc/nginx/conf.d/upload.conf
 
-# Get the number of workers for Nginx, default to 1
-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
-# Cannot exceed worker_rlimit_nofile, see NGINX_WORKER_OPEN_FILES below
-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
+/uwsgi-nginx-entrypoint.sh
 
 # Get the URL for static files from the environment variable
 USE_STATIC_URL=${STATIC_URL:-'/static'}
@@ -28,27 +10,26 @@ USE_STATIC_PATH=${STATIC_PATH:-'/app/static'}
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
 
-# Generate Nginx config first part using the environment variables
-echo "server {
-    listen ${USE_LISTEN_PORT};
-    location / {
-        try_files \$uri @app;
-    }
-    location @app {
-        include uwsgi_params;
-        uwsgi_pass unix:///tmp/uwsgi.sock;
-    }
-    location $USE_STATIC_URL {
-        alias $USE_STATIC_PATH;
-    }" > /etc/nginx/conf.d/nginx.conf
-
+content_server='server {\n'
+content_server=$content_server"    listen ${USE_LISTEN_PORT};\n"
+content_server=$content_server'    location / {\n'
+content_server=$content_server'        try_files $uri @app;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'    location @app {\n'
+content_server=$content_server'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server"    location $USE_STATIC_URL {\n"
+content_server=$content_server"        alias $USE_STATIC_PATH;\n"
+content_server=$content_server'    }\n'
 # If STATIC_INDEX is 1, serve / with /static/index.html directly (or the static URL configured)
-if [[ $STATIC_INDEX == 1 ]] ; then 
-echo "    location = / {
-        index $USE_STATIC_URL/index.html;
-    }" >> /etc/nginx/conf.d/nginx.conf
+if [ "$STATIC_INDEX" = 1 ] ; then
+    content_server=$content_server'    location = / {\n'
+    content_server=$content_server"        index $USE_STATIC_URL/index.html;\n"
+    content_server=$content_server'    }\n'
 fi
-# Finish the Nginx config file
-echo "}" >> /etc/nginx/conf.d/nginx.conf
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
 
-exec "$@"
+exec "$@"
diff --git a/python3.5/Dockerfile b/python3.5/Dockerfile
@@ -4,19 +4,6 @@ LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 
 RUN pip install flask
 
-# By default, allow unlimited file sizes, modify it to limit the file sizes
-# To have a maximum of 1 MB (Nginx's default) change the line to:
-# ENV NGINX_MAX_UPLOAD 1m
-ENV NGINX_MAX_UPLOAD 0
-
-# By default, Nginx listens on port 80.
-# To modify this, change LISTEN_PORT environment variable.
-# (in a Dockerfile or with an option for `docker run`)
-ENV LISTEN_PORT 80
-
-# Which uWSGI .ini file should be used, to make it customizable
-ENV UWSGI_INI /app/uwsgi.ini
-
 # URL under which static (not modified by Python) files will be requested
 # They will be served by Nginx directly, without being handled by uWSGI
 ENV STATIC_URL /static
@@ -38,6 +25,8 @@ ENV PYTHONPATH=/app
 COPY start.sh /start.sh
 RUN chmod +x /start.sh
 
+# Move the base entrypoint to reuse it
+RUN mv /entrypoint.sh /uwsgi-nginx-entrypoint.sh
 # Copy the entrypoint that will generate Nginx additional configs
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh