Generate Nginx configs from entrypoint and tests

python2.7-alpine3.7/Dockerfile

@@ -139,8 +139,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
-COPY nginx.conf /etc/nginx/nginx.conf
-
 # Standard set up Nginx finished
 
 EXPOSE 80
@@ -152,10 +150,6 @@ EXPOSE 443
 # Install uWSGI
 RUN apk add --no-cache uwsgi-python
 
-# Make NGINX run on the foreground
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-# Copy the modified Nginx conf
-COPY nginx-custom.conf /etc/nginx/conf.d/nginx.conf
 # Copy the base uWSGI ini file to enable default dynamic uwsgi process number
 COPY uwsgi.ini /etc/uwsgi/
 

python2.7-alpine3.7/entrypoint.sh

@@ -1,35 +1,61 @@
 #!/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
-
 # 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 maximum upload file size for Nginx, default to 0: unlimited
+USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0}
+
 # 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
+# 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
+NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1024}
 
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
-# Modify Nginx config for listen port
-if ! grep -q "listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf ; then
-    sed -i -e "/server {/a\    listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf
+
+content='user  nginx;\n'
+# Set the number of worker processes in Nginx
+content=$content"worker_processes ${USE_NGINX_WORKER_PROCESSES};\n"
+content=$content'error_log  /var/log/nginx/error.log warn;\n'
+content=$content'pid        /var/run/nginx.pid;\n'
+content=$content'events {\n'
+content=$content"    worker_connections ${NGINX_WORKER_CONNECTIONS};\n"
+content=$content'}\n'
+content=$content'http {\n'
+content=$content'    include       /etc/nginx/mime.types;\n'
+content=$content'    default_type  application/octet-stream;\n'
+content=$content'    log_format  main  '"'\$remote_addr - \$remote_user [\$time_local] \"\$request\" '\n"
+content=$content'                      '"'\$status \$body_bytes_sent \"\$http_referer\" '\n"
+content=$content'                      '"'\"\$http_user_agent\" \"\$http_x_forwarded_for\"';\n"
+content=$content'    access_log  /var/log/nginx/access.log  main;\n'
+content=$content'    sendfile        on;\n'
+content=$content'    keepalive_timeout  65;\n'
+content=$content'    include /etc/nginx/conf.d/*.conf;\n'
+content=$content'}\n'
+content=$content'daemon off;\n'
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [ -n "${NGINX_WORKER_OPEN_FILES}" ] ; then
+    content=$content"worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};\n"
 fi
+# Save generated /etc/nginx/nginx.conf
+printf "$content" > /etc/nginx/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'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
+
+# Generate Nginx config for maximum upload file size
+printf "client_max_body_size $USE_NGINX_MAX_UPLOAD;\n" > /etc/nginx/conf.d/upload.conf
+
 exec "$@"

python2.7-alpine3.8/Dockerfile

@@ -139,8 +139,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
-COPY nginx.conf /etc/nginx/nginx.conf
-
 # Standard set up Nginx finished
 
 EXPOSE 80
@@ -152,10 +150,6 @@ EXPOSE 443
 # Install uWSGI
 RUN apk add --no-cache uwsgi-python
 
-# Make NGINX run on the foreground
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-# Copy the modified Nginx conf
-COPY nginx-custom.conf /etc/nginx/conf.d/nginx.conf
 # Copy the base uWSGI ini file to enable default dynamic uwsgi process number
 COPY uwsgi.ini /etc/uwsgi/
 

python2.7-alpine3.8/entrypoint.sh

@@ -1,35 +1,61 @@
 #!/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
-
 # 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 maximum upload file size for Nginx, default to 0: unlimited
+USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0}
+
 # 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
+# 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
+NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1024}
 
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
-# Modify Nginx config for listen port
-if ! grep -q "listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf ; then
-    sed -i -e "/server {/a\    listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf
+
+content='user  nginx;\n'
+# Set the number of worker processes in Nginx
+content=$content"worker_processes ${USE_NGINX_WORKER_PROCESSES};\n"
+content=$content'error_log  /var/log/nginx/error.log warn;\n'
+content=$content'pid        /var/run/nginx.pid;\n'
+content=$content'events {\n'
+content=$content"    worker_connections ${NGINX_WORKER_CONNECTIONS};\n"
+content=$content'}\n'
+content=$content'http {\n'
+content=$content'    include       /etc/nginx/mime.types;\n'
+content=$content'    default_type  application/octet-stream;\n'
+content=$content'    log_format  main  '"'\$remote_addr - \$remote_user [\$time_local] \"\$request\" '\n"
+content=$content'                      '"'\$status \$body_bytes_sent \"\$http_referer\" '\n"
+content=$content'                      '"'\"\$http_user_agent\" \"\$http_x_forwarded_for\"';\n"
+content=$content'    access_log  /var/log/nginx/access.log  main;\n'
+content=$content'    sendfile        on;\n'
+content=$content'    keepalive_timeout  65;\n'
+content=$content'    include /etc/nginx/conf.d/*.conf;\n'
+content=$content'}\n'
+content=$content'daemon off;\n'
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [ -n "${NGINX_WORKER_OPEN_FILES}" ] ; then
+    content=$content"worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};\n"
 fi
+# Save generated /etc/nginx/nginx.conf
+printf "$content" > /etc/nginx/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'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
+
+# Generate Nginx config for maximum upload file size
+printf "client_max_body_size $USE_NGINX_MAX_UPLOAD;\n" > /etc/nginx/conf.d/upload.conf
+
 exec "$@"

python2.7/Dockerfile

@@ -104,12 +104,8 @@ EXPOSE 80
 # Expose 443, in case of LTS / HTTPS
 EXPOSE 443
 
-# Make NGINX run on the foreground
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 # Remove default configuration from Nginx
 RUN rm /etc/nginx/conf.d/default.conf
-# Copy the modified Nginx conf
-COPY nginx.conf /etc/nginx/conf.d/
 # Copy the base uWSGI ini file to enable default dynamic uwsgi process number
 COPY uwsgi.ini /etc/uwsgi/
 

python2.7/entrypoint.sh

@@ -1,31 +1,57 @@
-#!/bin/bash
+#!/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
+# 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
+NGINX_WORKER_CONNECTIONS=${NGINX_WORKER_CONNECTIONS:-1024}
 
 # Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
-# Modify Nignx config for listen port
-if ! grep -q "listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf ; then
-    sed -i -e "/server {/a\    listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf
+
+content='user  nginx;\n'
+# Set the number of worker processes in Nginx
+content=$content"worker_processes ${USE_NGINX_WORKER_PROCESSES};\n"
+content=$content'error_log  /var/log/nginx/error.log warn;\n'
+content=$content'pid        /var/run/nginx.pid;\n'
+content=$content'events {\n'
+content=$content"    worker_connections ${NGINX_WORKER_CONNECTIONS};\n"
+content=$content'}\n'
+content=$content'http {\n'
+content=$content'    include       /etc/nginx/mime.types;\n'
+content=$content'    default_type  application/octet-stream;\n'
+content=$content'    log_format  main  '"'\$remote_addr - \$remote_user [\$time_local] \"\$request\" '\n"
+content=$content'                      '"'\$status \$body_bytes_sent \"\$http_referer\" '\n"
+content=$content'                      '"'\"\$http_user_agent\" \"\$http_x_forwarded_for\"';\n"
+content=$content'    access_log  /var/log/nginx/access.log  main;\n'
+content=$content'    sendfile        on;\n'
+content=$content'    keepalive_timeout  65;\n'
+content=$content'    include /etc/nginx/conf.d/*.conf;\n'
+content=$content'}\n'
+content=$content'daemon off;\n'
+# Set the max number of open file descriptors for Nginx workers, if requested
+if [ -n "${NGINX_WORKER_OPEN_FILES}" ] ; then
+    content=$content"worker_rlimit_nofile ${NGINX_WORKER_OPEN_FILES};\n"
 fi
+# Save generated /etc/nginx/nginx.conf
+printf "$content" > /etc/nginx/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'        include uwsgi_params;\n'
+content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+content_server=$content_server'    }\n'
+content_server=$content_server'}\n'
+# Save generated server /etc/nginx/conf.d/nginx.conf
+printf "$content_server" > /etc/nginx/conf.d/nginx.conf
+
+# Generate Nginx config for maximum upload file size
+printf "client_max_body_size $USE_NGINX_MAX_UPLOAD;\n" > /etc/nginx/conf.d/upload.conf
+
 exec "$@"

python3.5/Dockerfile

@@ -102,12 +102,8 @@ EXPOSE 80
 # apt-key adv --no-tty
 # Standard set up Nginx finished
 
-# Make NGINX run on the foreground
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 # Remove default configuration from Nginx
 RUN rm /etc/nginx/conf.d/default.conf
-# Copy the modified Nginx conf
-COPY nginx.conf /etc/nginx/conf.d/
 # Copy the base uWSGI ini file to enable default dynamic uwsgi process number
 COPY uwsgi.ini /etc/uwsgi/