Merge branch 'master' into develop

Author: robertpeteuil

.gitignore

@@ -1,107 +1,2 @@
-### Python template
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-# Usually these files are written by a python script from a template
-# before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-
-*.iml
-
-## Directory-based project format:
+# repo specific gitignore
 .idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-

LICENSE.txt

@@ -186,7 +186,7 @@
  same "printed page" as the copyright notice for easier
  identification within third-party archives.
 
- Copyright {yyyy} {name of copyright owner}
+ Copyright 2017 Robert Peteuil
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

README.md

@@ -1,37 +1,96 @@
-*NOTE: These images are a fork or the repository [tiangolo/UWSGI-NGINX-DOCKER](https://github.com/tiangolo/uwsgi-nginx-docker). This fork was necessary because of an urgent need for changes and modifications, which are described below.*
-
 # Supported tags and `Dockerfile` links
 
- - [`python2.7` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python2.7/Dockerfile)
- - [`python2.7-alpine` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python2.7-alpine/Dockerfile)
- - [`python3.5` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.5/Dockerfile)
- - [`python3.5-alpine` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.5-alpine/Dockerfile)
- - [`python3.6` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.6/Dockerfile)
- - [`python3.6-alpine` _(Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.6-alpine/Dockerfile)
+- `py2.7`, `python2.7` [_(python2.7/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python2.7/Dockerfile)
+- `py2.7-alpine`, `python2.7-alpine` [_(python2.7-alpine/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python2.7-alpine/Dockerfile)
+- `py3.5`, `python3.5` [_(python3.5/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.5/Dockerfile)
+- `py3.5-alpine`, `python3.5-alpine` [_(python3.5-alpine/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.5-alpine/Dockerfile)
+- `py3.6`, `python3.6` [_(python3.6/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.6/Dockerfile)
+- `py3.6-alpine`, `python3.6-alpine` [_(python3.6-alpine/Dockerfile)_](https://github.com/robertpeteuil/docker-nginx-uwsgi/blob/master/python3.6-alpine/Dockerfile)
+
+**You must explicitly use one of the tags above.** The `latest` tag is not assigned since each tag represents a different variant, not an incremental version.
+
+## NGINX-UWSGI
+
+**Docker** image with **Nginx**, **uWSGI** and **Python** running in a single container to enable running Python Web Apps on NGINX.
+
+**GitHub Repo**: <https://github.com/robertpeteuil/docker-nginx-uwsgi>
+
+**Docker Hub Images**: <https://hub.docker.com/r/robpco/nginx-uwsgi/>
+
+## Overview
+
+This Docker image allow the creation/migration of Python Web Apps to run on Nginx and uWSGI in a single container. It's designed for use as base image for:
+
+- Other images - such as a pre-built image for running Flask Apps [nginx-uwsgi-flask](https://github.com/robertpeteuil/docker-nginx-uwsgi-flask) .
+- A development image that can be customized with your unique web-framework, Python libraries and code.
+
+This repo auto-generates images to [Docker-Hub](https://hub.docker.com/r/robpco/nginx-uwsgi/). It includes standard and alpine-based variants for each supported Python version (2.7, 3.5, 3.6).
+
+## Usage
 
-# Overview
+The Docker-Hub [repository](https://hub.docker.com/r/robpco/nginx-uwsgi/) contains auto-generated images from this repo. They can be referenced (or pulled) by using the image name `robpco/nginx-uwsgi`, plus a tag for the python version desired (ex: `:python3.6`), and optionally appending `-alpine` to the tag (for alpine variants).
 
-**Docker** image with **Nginx**, **uWSGI** and **Python** running in a single container that enables easy migration of Python Web Apps to production on NGINX. They are designed as a base image, and do not have web-frameworks pre-installed. To use them, add your web-framework of choice (Flask, Django, etc..) and python application.
+## Custom Environment Variables
 
-**For detailed information, examples and documentation visit tiangolo's [repo](https://github.com/tiangolo/uwsgi-nginx-docker).**
+This image supports the following custom environment variables:
 
-# Changes
+- **UWSGI_INI** - the path and file of the configuration info
+ - default: `/app/uwsgi.ini`
+- **NGINX_MAX_UPLOAD** - the maximum file upload size allowed by Nginx
+ - 0 = unlimited (image default)
+ - 1m = normal Nginx default
+- **LISTEN_PORT** - custom port that Nginx should listen on
+ - 80 = Nginx default
 
-These images include the following changes from the original repo:
-- The addition of alpine-linux variants that are much smaller in size.
-- `supervisord` enhancement to reduce CRIT errors
- - `supervisord.conf` is explicitly referenced via the Dockerfile CMD statement
- - `supervisord.conf` includes an explicitly set user-name (root) (which can be changed).
-- Includes an updated version of Nginx (1.13.7) on non-alpine variants
-- Includes updated python revisions for each supported version (2.7, 3.5, and 3.6)
-- Adds LISTEN_PORT environment var to allow setting custom ports; via docker run, or docker-compose.
+## Setting Environment Variables
 
-# Docker Hub Repository
+Environment variables can be set in multiple ways. The following examples, demonstrate setting the `LISTEN_PORT` environment variable via three different methods. These methods apply to the other Environment Variables as well.
 
-The docker-hub [repository](https://hub.docker.com/r/robpco/nginx-uwsgi/) contains pre-built images. The images can be pulled by using the python version as a tag (or python version + "-alpine").
+### Setting in a `Dockerfile`
 
-```bash
-docker pull robpco/nginx-uwsgi:python3.6-alpine
+```dockerfile
+# ... (snip) ...
+ENV LISTEN_PORT 8080
+# ... (snip) ...
 ```
 
-NOTE: They do NOT not support a `latest` tag, because they are different variants, not incremental versions. Using a `latest` tag with images of this sort can potentially lead to catastrophic results.
+### Setting during [`docker run`](https://docs.docker.com/engine/reference/commandline/run/#options) with the `-e` option
+
+```shell
+docker run -e LISTEN_PORT=8080 -p 8080:8080 myimage
+```
+
+### Setting in `docker-compose` file using the `environment:` keyword in a `docker-compose` file
+
+```yml
+version: '2.2'
+services:
+ web:
+ image: myapp
+ environment:
+ LISTEN_PORT: 8080
+```
+
+Inspired by the project at [tiangolo/UWSGI-NGINX-DOCKER](https://github.com/tiangolo/uwsgi-nginx-docker).
+
+## UPDATES
+
+- 2017-12-11: Added multiple tags per variant: `py3.6` is the same as `python3.6`, and so forth...
+- 2017-11-29: Added ability to change port Nginx listens on with new environment variable `LISTEN_PORT`.
+ - Thanks to github user [tmshn](https://github.com/tmshn)
+- 2017-11-29: Alpine variants added
+ - Thanks to github user [ProgEsteves](https://github.com/ProgEsteves)
+- 2017-11-29: Automatic image re-build when Python updates
+- 2017-11-28: Updated Nginx version installed on non-Alpine images
+
+## CHANGELOG
+
+- 2017-12-15: Fix to avoid duplicate listen entries in nginx.conf
+- 2017-11-30: Alpine images - eliminated uWSGI random build failures
+- 2017-11-30: Non-Alpine images - limit build failures caused by GPG key validation failing
+- 2017-11-29: Alpine required additional changes:
+ - Replace default `/etc/nginx/nginx.conf` with an alternate version
+ - Create `/run/nginx` directory to stop immediate Nginx crash
+- 2017-11-28: Fixed console errors from supervisor process:
+ - Added explicit path reference to `supervisord.conf` in Dockerfile `CMD` statement
+ - Added explicitly set username in `supervisord.conf`

python2.7-alpine/Dockerfile

@@ -1,36 +1,38 @@
 FROM python:2.7-alpine
 
-RUN apk update \
- && apk add --no-cache gcc \
- libc-dev \
- linux-headers \
- bash \
- nginx \
- supervisor \
- && pip install uwsgi
-
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log
-EXPOSE 80 443
+RUN set -x && \
+ apk add --no-cache \
+ gcc \
+ libc-dev \
+ linux-headers \
+ bash \
+ nginx \
+ supervisor \
+ # protect against uwsgi compile failing randomly
+ && (while true; do pip install --no-cache-dir --disable-pip-version-check uwsgi && break; done)
+
+RUN ln -sf /dev/stdout /var/log/nginx/access.log && \
+ ln -sf /dev/stderr /var/log/nginx/error.log
 
 # Replace Nginx configuration on alpine
-RUN rm /etc/nginx/nginx.conf
 COPY nginx.main.conf /etc/nginx/nginx.conf
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-RUN mkdir -p /run/nginx
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN mkdir -p /run/nginx && \
+ echo "daemon off;" >> /etc/nginx/nginx.conf
 
+# copy config files
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY nginx.conf /etc/nginx/conf.d/
 COPY uwsgi.ini /etc/uwsgi/
 
+# set ENV variables and expose ports
 ENV UWSGI_INI /app/uwsgi.ini
-# Enable unlimited filesize uploads by setting to 0
-ENV NGINX_MAX_UPLOAD 1m
-
-# Change default Nginx port
+# Enable limiting maximum filesize upload (nginx default is 1m)
+ENV NGINX_MAX_UPLOAD 0
+# Enable changing default listening port on Nginx
 ENV LISTEN_PORT 80
+EXPOSE 80 443
 
-# entrypoint.sh generates additional Nginx configs
+# setup entrypoint.sh which generates Nginx configs at runtime
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 

python2.7-alpine/Dockerfile.old

@@ -1,3 +1,4 @@
 def application(env, start_response):
  start_response('200 OK', [('Content-Type', 'text/html')])
- return ["Hello World from a default Nginx uWSGI Python 2.7 app in an alpine Docker container (default)"]
+ return ["Hello World from a default uWSGI Python 2.7 app in an\
+ Alpine-Linux Docker container with Nginx (default)"]

python2.7-alpine/app/main.py

@@ -5,9 +5,12 @@ 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
 
+# Add installed packages to PYTHONPATH to enable uWSGI imports
+export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages
+
 #Get the listen port for Nginx, default to 80
 USE_LISTEN_PORT=${LISTEN_PORT:-80}
-# Modify Nignx config for listen port
-sed -i -e "/server {/a\ listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf
-
+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
+fi
 exec "$@"