Skip to content
This repository was archived by the owner on Dec 17, 2023. It is now read-only.

Commit 76682e4

Browse files
committed
update README
1 parent e39fd33 commit 76682e4

File tree

9 files changed

+5
-168
lines changed

9 files changed

+5
-168
lines changed

README.md

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Supported tags and respective `Dockerfile` links
22

33
- `2.7`, `py2.7`, `python2.7` [_(python2.7/Dockerfile)_](https://github.com/robpco/docker-nginx-uwsgi-flask/blob/master/python2.7/Dockerfile)
4-
- `2.7-A`, `py2.7-A`, `py2.7-alpine`, `python2.7-alpine` [_(python2.7-alpine/Dockerfile)_](https://github.com/robpco/docker-nginx-uwsgi-flask/blob/master/python2.7-alpine/Dockerfile)
54
- `3.6`, `py3.6`, `python3.6` [_(python3.6/Dockerfile)_](https://github.com/robpco/docker-nginx-uwsgi-flask/blob/master/python3.6/Dockerfile)
6-
- `3.6-A`, `py3.6-A`, `py3.6-alpine`, `python3.6-alpine` [_(python3.6-alpine/Dockerfile)_](https://github.com/robpco/docker-nginx-uwsgi-flask/blob/master/python3.6-alpine/Dockerfile)
75

86
**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.
97

@@ -21,7 +19,7 @@ This **Docker** image enables Python **Flask** Apps to run on **Nginx** using **
2119

2220
This image builds on the [nginx-uwsgi](https://hub.docker.com/r/robpco/nginx-uwsgi/) base image and adds Flask support and additional Environment Variables to enable customization.
2321

24-
This repo auto-generates images to [Docker-Hub](https://hub.docker.com/r/robpco/nginx-uwsgi-flask/). It includes standard and alpine-based variants for each supported Python version (2.7, 3.6).
22+
This repo auto-generates images to [Docker-Hub](https://hub.docker.com/r/robpco/nginx-uwsgi-flask/). It includes variants for each supported Python version (2.7, 3.6).
2523

2624
## Usage
2725

@@ -35,11 +33,11 @@ To use this image as a base for a **Flask Web-App**:
3533

3634
### STEP 1 - Create a `Dockerfile`
3735

38-
- In this example, we use the `FROM` line to specify this image and the `python3.6-alpine` variant
36+
- In this example, we use the `FROM` line to specify this image and the `python3.6` variant
3937
- We copy our python scripts, in a sub-directory on the local computer called `app`, to a folder in the container called `/app`.
4038

4139
```Dockerfile
42-
FROM robpco/nginx-uwsgi-flask:python3.6-alpine
40+
FROM robpco/nginx-uwsgi-flask:python3.6
4341

4442
COPY ./app /app
4543
```
@@ -114,27 +112,19 @@ services:
114112
LISTEN_PORT: 8080
115113
```
116114
117-
Inspired by the project at [tiangolo/UWSGI-NGINX-DOCKER](https://github.com/tiangolo/uwsgi-nginx-docker).
118-
119115
## UPDATES
120116
121117
- 2017-12-11: Added multiple tags per variant: `py3.6` is the same as `python3.6`, and so forth...
122118
- 2017-11-29: Added ability to change port Nginx listens on with new environment variable `LISTEN_PORT`.
123119
- Thanks to github user [tmshn](https://github.com/tmshn)
124-
- 2017-11-29: Alpine variants added
125-
- Thanks to github user [ProgEsteves](https://github.com/ProgEsteves)
126120
- 2017-11-29: Automatic image re-build when Python updates
127-
- 2017-11-28: Updated Nginx version installed on non-Alpine images
121+
- 2017-11-28: Updated Nginx version installed
128122
- 2018-05-04: Updated for new base images
129123

130124
## CHANGELOG
131125

132126
- 2017-12-15: Fix to avoid duplicate listen entries in nginx.conf
133-
- 2017-11-30: Alpine images - eliminated uWSGI random build failures
134-
- 2017-11-30: Non-Alpine images - limit build failures caused by GPG key validation failing
135-
- 2017-11-29: Alpine required additional changes:
136-
- Replace default `/etc/nginx/nginx.conf` with an alternate version
137-
- Create `/run/nginx` directory to stop immediate Nginx crash
127+
- 2017-11-30: limit build failures caused by GPG key validation failing
138128
- 2017-11-28: Fixed console errors from supervisor process:
139129
- Added explicit path reference to `supervisord.conf` in Dockerfile `CMD` statement
140130
- Added explicitly set username in `supervisord.conf`

python2.7-alpine/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

python2.7-alpine/app/main.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

python2.7-alpine/app/uwsgi.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

python2.7-alpine/entrypoint.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

python3.6-alpine/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

python3.6-alpine/app/main.py

Lines changed: 0 additions & 11 deletions
This file was deleted.

python3.6-alpine/app/uwsgi.ini

Lines changed: 0 additions & 3 deletions
This file was deleted.

python3.6-alpine/entrypoint.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)