✨ Add Python 3.9 and Alpine Python 3.9 (#52)

Co-authored-by: Sebastián Ramírez <[email protected]>
tiangolo · Sep 17, 2021 · e4e05ee · e4e05ee
1 parent 8748ba1
commit e4e05ee
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,15 +11,21 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.8"
+            python_version: "3.9"
+          - name: python3.9
+            python_version: "3.9"
           - name: python3.8
             python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
             python_version: "3.6"
+          - name: python3.9-slim
+            python_version: "3.9"
           - name: python3.8-slim
             python_version: "3.8"
+          - name: python3.9-alpine3.14
+            python_version: "3.9"
           - name: python3.8-alpine3.10
             python_version: "3.8"
           - name: python3.7-alpine3.8

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,15 +11,21 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.8"
+            python_version: "3.9"
+          - name: python3.9
+            python_version: "3.9"
           - name: python3.8
             python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
             python_version: "3.6"
+          - name: python3.9-slim
+            python_version: "3.9"
           - name: python3.8-slim
             python_version: "3.8"
+          - name: python3.9-alpine3.14
+            python_version: "3.9"
           - name: python3.8-alpine3.10
             python_version: "3.8"
           - name: python3.7-alpine3.8

diff --git a/README.md b/README.md
@@ -2,10 +2,13 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`python3.8`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.8.dockerfile)
+* [`python3.9`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.9.dockerfile)
+* [`python3.8`, _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.8.dockerfile)
 * [`python3.7`, _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.7.dockerfile)
 * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.6.dockerfile)
+* [`python3.9-slim` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.9-slim.dockerfile)
 * [`python3.8-slim` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.8-slim.dockerfile)
+* [`python3.9-alpine3.14` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.9-alpine3.14.dockerfile)
 * [`python3.8-alpine3.10` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.8-alpine3.10.dockerfile)
 * [`python3.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.7-alpine3.8.dockerfile)
 * [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile)
@@ -72,7 +75,7 @@ If you are creating a new [**FastAPI**](https://fastapi.tiangolo.com/) web appli
 * You don't need to clone the GitHub repo. You can use this image as a base image for other images, using this in your `Dockerfile`:
 
 ```Dockerfile
-FROM tiangolo/uvicorn-gunicorn:python3.7
+FROM tiangolo/uvicorn-gunicorn:python3.9
 
 COPY ./app /app
 ```
@@ -116,7 +119,7 @@ Let's say you have a project managed with [Poetry](https://python-poetry.org/),
 Then you could have a `Dockerfile` like:
 
 ```Dockerfile
-FROM tiangolo/uvicorn-gunicorn:python3.7
+FROM tiangolo/uvicorn-gunicorn:python3.9
 
 # Install Poetry
 RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \

diff --git a/docker-images/python3.9-alpine3.14.dockerfile b/docker-images/python3.9-alpine3.14.dockerfile
@@ -0,0 +1,26 @@
+FROM python:3.9-alpine3.14
+
+LABEL maintainer="Sebastian Ramirez <[email protected]>"
+
+RUN apk add --no-cache --virtual .build-deps gcc libc-dev make \
+    && pip install --no-cache-dir "uvicorn[standard]" gunicorn \
+    && apk del .build-deps gcc libc-dev make
+
+COPY ./start.sh /start.sh
+RUN chmod +x /start.sh
+
+COPY ./gunicorn_conf.py /gunicorn_conf.py
+
+COPY ./start-reload.sh /start-reload.sh
+RUN chmod +x /start-reload.sh
+
+COPY ./app /app
+WORKDIR /app/
+
+ENV PYTHONPATH=/app
+
+EXPOSE 80
+
+# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
+# And then will start Gunicorn with Uvicorn
+CMD ["/start.sh"]
diff --git a/docker-images/python3.9-slim.dockerfile b/docker-images/python3.9-slim.dockerfile
@@ -0,0 +1,24 @@
+FROM python:3.9-slim
+
+LABEL maintainer="Sebastian Ramirez <[email protected]>"
+
+RUN pip install --no-cache-dir "uvicorn[standard]" gunicorn
+
+COPY ./start.sh /start.sh
+RUN chmod +x /start.sh
+
+COPY ./gunicorn_conf.py /gunicorn_conf.py
+
+COPY ./start-reload.sh /start-reload.sh
+RUN chmod +x /start-reload.sh
+
+COPY ./app /app
+WORKDIR /app/
+
+ENV PYTHONPATH=/app
+
+EXPOSE 80
+
+# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
+# And then will start Gunicorn with Uvicorn
+CMD ["/start.sh"]
diff --git a/docker-images/python3.9.dockerfile b/docker-images/python3.9.dockerfile
@@ -0,0 +1,24 @@
+FROM python:3.9
+
+LABEL maintainer="Sebastian Ramirez <[email protected]>"
+
+RUN pip install --no-cache-dir "uvicorn[standard]" gunicorn
+
+COPY ./start.sh /start.sh
+RUN chmod +x /start.sh
+
+COPY ./gunicorn_conf.py /gunicorn_conf.py
+
+COPY ./start-reload.sh /start-reload.sh
+RUN chmod +x /start-reload.sh
+
+COPY ./app /app
+WORKDIR /app/
+
+ENV PYTHONPATH=/app
+
+EXPOSE 80
+
+# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations)
+# And then will start Gunicorn with Uvicorn
+CMD ["/start.sh"]
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -6,7 +6,7 @@ use_tag="tiangolo/uvicorn-gunicorn:$NAME"
 DOCKERFILE="$NAME"
 
 if [ "$NAME" == "latest" ] ; then
-    DOCKERFILE="python3.8"
+    DOCKERFILE="python3.9"
 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,11 +3,14 @@
 import sys
 
 environments = [
-    {"NAME": "latest", "PYTHON_VERSION": "3.8"},
+    {"NAME": "latest", "PYTHON_VERSION": "3.9"},
+    {"NAME": "python3.9", "PYTHON_VERSION": "3.9"},
     {"NAME": "python3.8", "PYTHON_VERSION": "3.8"},
     {"NAME": "python3.7", "PYTHON_VERSION": "3.7"},
     {"NAME": "python3.6", "PYTHON_VERSION": "3.6"},
+    {"NAME": "python3.9-slim", "PYTHON_VERSION": "3.9"},
     {"NAME": "python3.8-slim", "PYTHON_VERSION": "3.8"},
+    {"NAME": "python3.9-alpine3.14", "PYTHON_VERSION": "3.9"},
     {"NAME": "python3.8-alpine3.10", "PYTHON_VERSION": "3.8"},
     {"NAME": "python3.7-alpine3.8", "PYTHON_VERSION": "3.7"},
     {"NAME": "python3.6-alpine3.8", "PYTHON_VERSION": "3.6"},