tiangolo · tiangolo · May 9, 2020 · May 9, 2020 · May 9, 2020 · May 9, 2020
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,21 +11,17 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.7"
+            python_version: "3.8"
+          - name: python3.8
+            python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
             python_version: "3.6"
           - name: python2.7
             python_version: "2.7"
-          - name: python3.6-alpine3.8
-            python_version: "3.6"
-          - name: python3.6-alpine3.7
-            python_version: "3.6"
-          - name: python2.7-alpine3.8
-            python_version: "2.7"
-          - name: python2.7-alpine3.7
-            python_version: "2.7"
+          - name: python3.8-alpine
+            python_version: "3.8"
       fail-fast: true
     runs-on: ubuntu-18.04
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,21 +11,17 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.7"
+            python_version: "3.8"
+          - name: python3.8
+            python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
             python_version: "3.6"
           - name: python2.7
             python_version: "2.7"
-          - name: python3.6-alpine3.8
-            python_version: "3.6"
-          - name: python3.6-alpine3.7
-            python_version: "3.6"
-          - name: python2.7-alpine3.8
-            python_version: "2.7"
-          - name: python2.7-alpine3.7
-            python_version: "2.7"
+          - name: python3.8-alpine
+            python_version: "3.8"
       fail-fast: true
     runs-on: ubuntu-18.04
     steps:

diff --git a/README.md b/README.md
@@ -2,22 +2,14 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.7.dockerfile)
+* [`python3.8`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.8.dockerfile)
+* [`python3.8-alpine` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.8-alpine.dockerfile)
+* [`python3.7`, _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.7.dockerfile)
 * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6.dockerfile)
-* [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile)
-* [`python3.6-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python3.6-alpine3.7.dockerfile)
 * [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7.dockerfile)
-* [`python2.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7-alpine3.8.dockerfile)
-* [`python2.7-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-flask-docker/blob/master/docker-images/python2.7-alpine3.7.dockerfile)
 
 **Note**: Note: There are [tags for each build date](https://hub.docker.com/r/tiangolo/uwsgi-nginx-flask/tags). If you need to "pin" the Docker image version you use, you can select one of those tags. E.g. `tiangolo/uwsgi-nginx-flask:python3.7-2019-10-14`.
 
-## Python 3.7 not supported in in Alpine
-
-As uWSGI has not been released with Python 3.7 support for [Alpine 3.7](https://pkgs.alpinelinux.org/package/v3.7/main/x86/uwsgi-python3) and [Alpine 3.8](https://pkgs.alpinelinux.org/package/v3.8/main/x86/uwsgi-python3), it is still not supported.
-
-It doesn't depend on this image but on uWSGI releases for Alpine.
-
 # uwsgi-nginx-flask
 
 **Docker** image with **uWSGI** and **Nginx** for **Flask** web applications in **Python 3.6** and above, and **Python 2.7** running in a single container. Optionally using Alpine Linux.
@@ -59,24 +51,24 @@ It is very similar to **tiangolo/uwsgi-nginx-flask**, so you can still use many
 
 ## Examples (simple project templates)
 
-* **`python3.7`** tag: general Flask web application:
+* **`python3.8`** tag: general Flask web application:
 
-[**example-flask-python3.7.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-python3.7.zip>)
+[**example-flask-python3.8.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-python3.8.zip>)
 
-* **`python3.7`** tag: general Flask web application, structured as a package, for bigger Flask projects, with different submodules. Use it only as an example of how to import your modules and how to structure your own project:
+* **`python3.8`** tag: general Flask web application, structured as a package, for bigger Flask projects, with different submodules. Use it only as an example of how to import your modules and how to structure your own project:
 
-[**example-flask-package-python3.7.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-package-python3.7.zip>)
+[**example-flask-package-python3.8.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-package-python3.8.zip>)
 
-* **`python3.7`** tag: `static/index.html` served directly in `/`, e.g. for [Vue](https://vuejs.org/), [React](https://reactjs.org/), [Angular](https://angular.io/), or any other Single-Page Application that uses a static `index.html`, not modified by Python:
+* **`python3.8`** tag: `static/index.html` served directly in `/`, e.g. for [Vue](https://vuejs.org/), [React](https://reactjs.org/), [Angular](https://angular.io/), or any other Single-Page Application that uses a static `index.html`, not modified by Python:
 
-[**example-flask-python3.7-index.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-python3.7-index.zip>)
+[**example-flask-python3.8-index.zip**](<https://github.com/tiangolo/uwsgi-nginx-flask-docker/releases/download/1.2.1/example-flask-python3.8-index.zip>)
 
 ## General Instructions
 
 You don't have to clone this repo, you should be able to use this image as a base image for your project with something in your `Dockerfile` like:
 
 ```Dockerfile
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 COPY ./app /app
 ```
@@ -91,7 +83,7 @@ This Docker image is based on [**tiangolo/uwsgi-nginx**](https://hub.docker.com/
 
 ## Quick Start
 
-**Note**: You can download the **example-flask-python3.7.zip** project example and use it as the template for your project from the section **Examples** above.
+**Note**: You can download the **example-flask-python3.8.zip** project example and use it as the template for your project from the section **Examples** above.
 
 ---
 
@@ -101,7 +93,7 @@ Or you may follow the instructions to build your project from scratch:
 * Create a `Dockerfile` with:
 
 ```Dockerfile
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 COPY ./app /app
 ```
@@ -278,7 +270,7 @@ If you want to check the previous (deprecated) documentation on adding a fronten
 
 ## Quick Start for bigger projects structured as a Python package
 
-**Note**: You can download the **example-flask-package-python3.7.zip** project example and use it as an example or template for your project from the section **Examples** above.
+**Note**: You can download the **example-flask-package-python3.8.zip** project example and use it as an example or template for your project from the section **Examples** above.
 
 ---
 
@@ -416,7 +408,7 @@ Have in mind that `UWSGI_CHEAPER` must be lower than `UWSGI_PROCESSES`.
 So, if, for example, you need to start with 4 processes and grow to a maximum of 64, your `Dockerfile` could look like:
 
 ```Dockerfile
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 ENV UWSGI_CHEAPER 4
 ENV UWSGI_PROCESSES 64
@@ -443,7 +435,7 @@ To change this behavior, set the `LISTEN_PORT` environment variable. You might a
 You can do that in your `Dockerfile`, it would look something like:
 
 ```Dockerfile
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 ENV LISTEN_PORT 8080
 
@@ -580,7 +572,7 @@ or you can set it to the keyword `auto` and it will try to auto-detect the numbe
 For example, using `auto`, your Dockerfile could look like:
 
 ```Dockerfile
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 ENV NGINX_WORKER_PROCESSES auto
 
@@ -761,7 +753,7 @@ if __name__ == "__main__":
 
 ...and you could run it with `python main.py`. But that will only work when you are not using a package structure and don't plan to do it later. In that specific case, if you didn't add the code block above, your app would only listen to `localhost` (inside the container), in another port (5000) and not in debug mode.
 
-**Note**: The example project **example-flask-python3.7** includes a `docker-compose.yml` and `docker-compose.override.yml` with all these configurations, if you are using Docker Compose.
+**Note**: The example project **example-flask-python3.8** includes a `docker-compose.yml` and `docker-compose.override.yml` with all these configurations, if you are using Docker Compose.
 
 ---
 
@@ -803,7 +795,7 @@ def route_frontend(path):
 
 That's how it is written in the tutorial above and is included in the downloadable examples.
 
-**Note**: The example project **example-flask-python3.7-index** includes a `docker-compose.yml` and `docker-compose.override.yml` with all these configurations, if you are using Docker Compose.
+**Note**: The example project **example-flask-python3.8-index** includes a `docker-compose.yml` and `docker-compose.override.yml` with all these configurations, if you are using Docker Compose.
 
 ## More advanced development instructions
 
@@ -861,6 +853,7 @@ You will see your Flask debugging server start, you will see how it sends respon
     * Debian Stretch (before upgrading to Buster).
     * Python 3.5.
     * Alpine 3.7 and 3.8 (before upgrading to Alpine 3.11).
+    * Alpine in older versions of Python, 2.7 and 3.6 (Before upgrading to Python 3.8).
     * Tags with `-index` (use `ENV STATIC_INDEX 1` instead).
     * If you need any of those, make sure to use a tag for the build date `2020-05-04`.
 
@@ -871,7 +864,7 @@ You will see your Flask debugging server start, you will see how it sends respon
 
 ### 1.2.0
 
-* Refactor tests to use env vars and add image tags for each build date, like `tiangolo/uwsgi-nginx-flask:python3.7-2019-10-14`. PR [#154](https://github.com/tiangolo/uwsgi-nginx-flask-docker/pull/154).
+* Refactor tests to use env vars and add image tags for each build date, like `tiangolo/uwsgi-nginx-flask:python3.8-2019-10-14`. PR [#154](https://github.com/tiangolo/uwsgi-nginx-flask-docker/pull/154).
 * Upgrade Travis. PR [#135](https://github.com/tiangolo/uwsgi-nginx-flask-docker/pull/135).
 
 ### 1.1.0

diff --git a/docker-images/python3.6-alpine3.7.dockerfile b/docker-images/python3.6-alpine3.7.dockerfile
diff --git a/docker-images/python3.6-alpine3.8.dockerfile b/docker-images/python3.6-alpine3.8.dockerfile
diff --git a/docker-images/python2.7-alpine3.7.dockerfile → docker-images/python3.8-alpine.dockerfile b/docker-images/python2.7-alpine3.7.dockerfile → docker-images/python3.8-alpine.dockerfile
@@ -1,4 +1,4 @@
-FROM tiangolo/uwsgi-nginx:python2.7-alpine3.7
+FROM tiangolo/uwsgi-nginx:python3.8-alpine
 
 LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 

diff --git a/docker-images/python2.7-alpine3.8.dockerfile → docker-images/python3.8.dockerfile b/docker-images/python2.7-alpine3.8.dockerfile → docker-images/python3.8.dockerfile
@@ -1,4 +1,4 @@
-FROM tiangolo/uwsgi-nginx:python2.7-alpine3.8
+FROM tiangolo/uwsgi-nginx:python3.8
 
 LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
 

diff --git a/example-flask-package-python3.7/Dockerfile b/example-flask-package-python3.7/Dockerfile
diff --git a/example-flask-package-python3.8/Dockerfile b/example-flask-package-python3.8/Dockerfile
@@ -0,0 +1,3 @@
+FROM tiangolo/uwsgi-nginx-flask:python3.8
+
+COPY ./app /app
diff --git a/...ask-package-python3.7/app/app/__init__.py → ...ask-package-python3.8/app/app/__init__.py b/...ask-package-python3.7/app/app/__init__.py → ...ask-package-python3.8/app/app/__init__.py
diff --git a/...package-python3.7/app/app/api/__init__.py → ...package-python3.8/app/app/api/__init__.py b/...package-python3.7/app/app/api/__init__.py → ...package-python3.8/app/app/api/__init__.py
diff --git a/...lask-package-python3.7/app/app/api/api.py → ...lask-package-python3.8/app/app/api/api.py b/...lask-package-python3.7/app/app/api/api.py → ...lask-package-python3.8/app/app/api/api.py
diff --git a/...thon3.7/app/app/api/endpoints/__init__.py → ...thon3.8/app/app/api/endpoints/__init__.py b/...thon3.7/app/app/api/endpoints/__init__.py → ...thon3.8/app/app/api/endpoints/__init__.py
diff --git a/...e-python3.7/app/app/api/endpoints/user.py → ...e-python3.8/app/app/api/endpoints/user.py b/...e-python3.7/app/app/api/endpoints/user.py → ...e-python3.8/app/app/api/endpoints/user.py
diff --git a/...sk-package-python3.7/app/app/api/utils.py → ...sk-package-python3.8/app/app/api/utils.py b/...sk-package-python3.7/app/app/api/utils.py → ...sk-package-python3.8/app/app/api/utils.py
diff --git a/...ackage-python3.7/app/app/core/__init__.py → ...ackage-python3.8/app/app/core/__init__.py b/...ackage-python3.7/app/app/core/__init__.py → ...ackage-python3.8/app/app/core/__init__.py
diff --git a/...ckage-python3.7/app/app/core/app_setup.py → ...ckage-python3.8/app/app/core/app_setup.py b/...ckage-python3.7/app/app/core/app_setup.py → ...ckage-python3.8/app/app/core/app_setup.py
diff --git a/...ackage-python3.7/app/app/core/database.py → ...ackage-python3.8/app/app/core/database.py b/...ackage-python3.7/app/app/core/database.py → ...ackage-python3.8/app/app/core/database.py
diff --git a/...e-flask-package-python3.7/app/app/main.py → ...e-flask-package-python3.8/app/app/main.py b/...e-flask-package-python3.7/app/app/main.py → ...e-flask-package-python3.8/app/app/main.py
diff --git a/...kage-python3.7/app/app/models/__init__.py → ...kage-python3.8/app/app/models/__init__.py b/...kage-python3.7/app/app/models/__init__.py → ...kage-python3.8/app/app/models/__init__.py
diff --git a/...-package-python3.7/app/app/models/user.py → ...-package-python3.8/app/app/models/user.py b/...-package-python3.7/app/app/models/user.py → ...-package-python3.8/app/app/models/user.py
diff --git a/...ple-flask-package-python3.7/app/uwsgi.ini → ...ple-flask-package-python3.8/app/uwsgi.ini b/...ple-flask-package-python3.7/app/uwsgi.ini → ...ple-flask-package-python3.8/app/uwsgi.ini
diff --git a/...age-python3.7/docker-compose.override.yml → ...age-python3.8/docker-compose.override.yml b/...age-python3.7/docker-compose.override.yml → ...age-python3.8/docker-compose.override.yml
diff --git a/...lask-package-python3.7/docker-compose.yml → ...lask-package-python3.8/docker-compose.yml b/...lask-package-python3.7/docker-compose.yml → ...lask-package-python3.8/docker-compose.yml
diff --git a/example-flask-python3.7/Dockerfile b/example-flask-python3.7/Dockerfile
diff --git a/example-flask-python3.7-index/Dockerfile → example-flask-python3.8-index/Dockerfile b/example-flask-python3.7-index/Dockerfile → example-flask-python3.8-index/Dockerfile
@@ -1,4 +1,4 @@
-FROM tiangolo/uwsgi-nginx-flask:python3.7
+FROM tiangolo/uwsgi-nginx-flask:python3.8
 
 # If STATIC_INDEX is 1, serve / with /static/index.html directly (or the static URL configured)
 ENV STATIC_INDEX 1

diff --git a/example-flask-python3.7-index/app/main.py → example-flask-python3.8-index/app/main.py b/example-flask-python3.7-index/app/main.py → example-flask-python3.8-index/app/main.py
diff --git a/...ask-python3.7-index/app/static/index.html → ...ask-python3.8-index/app/static/index.html b/...ask-python3.7-index/app/static/index.html → ...ask-python3.8-index/app/static/index.html
diff --git a/example-flask-python3.7-index/app/uwsgi.ini → example-flask-python3.8-index/app/uwsgi.ini b/example-flask-python3.7-index/app/uwsgi.ini → example-flask-python3.8-index/app/uwsgi.ini
diff --git a/...thon3.7-index/docker-compose.override.yml → ...thon3.8-index/docker-compose.override.yml b/...thon3.7-index/docker-compose.override.yml → ...thon3.8-index/docker-compose.override.yml
diff --git a/...-flask-python3.7-index/docker-compose.yml → ...-flask-python3.8-index/docker-compose.yml b/...-flask-python3.7-index/docker-compose.yml → ...-flask-python3.8-index/docker-compose.yml
diff --git a/example-flask-python3.8/Dockerfile b/example-flask-python3.8/Dockerfile
@@ -0,0 +1,3 @@
+FROM tiangolo/uwsgi-nginx-flask:python3.8
+
+COPY ./app /app
diff --git a/example-flask-python3.7/app/main.py → example-flask-python3.8/app/main.py b/example-flask-python3.7/app/main.py → example-flask-python3.8/app/main.py
diff --git a/example-flask-python3.7/app/uwsgi.ini → example-flask-python3.8/app/uwsgi.ini b/example-flask-python3.7/app/uwsgi.ini → example-flask-python3.8/app/uwsgi.ini
diff --git a/...ask-python3.7/docker-compose.override.yml → ...ask-python3.8/docker-compose.override.yml b/...ask-python3.7/docker-compose.override.yml → ...ask-python3.8/docker-compose.override.yml
diff --git a/example-flask-python3.7/docker-compose.yml → example-flask-python3.8/docker-compose.yml b/example-flask-python3.7/docker-compose.yml → example-flask-python3.8/docker-compose.yml
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -6,7 +6,7 @@ use_tag="tiangolo/uwsgi-nginx-flask:$NAME"
 DOCKERFILE="$NAME"
 
 if [ "$NAME" == "latest" ] ; then
-    DOCKERFILE="python3.7"
+    DOCKERFILE="python3.8"
 fi
 
 docker build -t "$use_tag" --file "./docker-images/${DOCKERFILE}.dockerfile" "./docker-images/"
diff --git a/scripts/process_all.py b/scripts/process_all.py
@@ -3,14 +3,12 @@
 import sys
 
 environments = [
-    {"NAME": "latest", "PYTHON_VERSION": "3.7"},
+    {"NAME": "latest", "PYTHON_VERSION": "3.8"},
+    {"NAME": "python3.8", "PYTHON_VERSION": "3.8"},
     {"NAME": "python3.7", "PYTHON_VERSION": "3.7"},
     {"NAME": "python3.6", "PYTHON_VERSION": "3.6"},
     {"NAME": "python2.7", "PYTHON_VERSION": "2.7"},
-    {"NAME": "python3.6-alpine3.8", "PYTHON_VERSION": "3.6"},
-    {"NAME": "python3.6-alpine3.7", "PYTHON_VERSION": "3.6"},
-    {"NAME": "python2.7-alpine3.8", "PYTHON_VERSION": "2.7"},
-    {"NAME": "python2.7-alpine3.7", "PYTHON_VERSION": "2.7"},
+    {"NAME": "python3.8-alpine", "PYTHON_VERSION": "3.8"},
 ]
 
 start_with = os.environ.get("START_WITH")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM tiangolo/uwsgi-nginx-flask:python3.8

		COPY ./app /app