From a3084700d31ee4fb3cebfbc51c867ebe6914c7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Thu, 7 May 2020 13:56:21 +0200 Subject: [PATCH] :fire: Remove support for Python 3.5 (#81) --- .github/workflows/deploy.yml | 2 - .github/workflows/test.yml | 2 - README.md | 3 +- docker-images/python3.5.dockerfile | 67 ------------------------------ scripts/process_all.py | 1 - 5 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 docker-images/python3.5.dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4cacd4a..7a08ab8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,8 +16,6 @@ jobs: python_version: "3.7" - name: python3.6 python_version: "3.6" - - name: python3.5 - python_version: "3.5" - name: python2.7 python_version: "2.7" - name: python3.6-alpine3.9 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c31c6a8..844e152 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,6 @@ jobs: python_version: "3.7" - name: python3.6 python_version: "3.6" - - name: python3.5 - python_version: "3.5" - name: python2.7 python_version: "2.7" - name: python3.6-alpine3.9 diff --git a/README.md b/README.md index b32c198..ea52ce6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ * [`python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.7.dockerfile) * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.6.dockerfile) -* [`python3.5` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.5.dockerfile) * [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python2.7.dockerfile) * [`python3.6-alpine3.9` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.6-alpine3.9.dockerfile) * [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile) @@ -23,7 +22,7 @@ It doesn't depend on this image but on uWSGI releases for Alpine. # uwsgi-nginx -**Docker** image with **uWSGI** and **Nginx** for web applications in **Python 3.5** and above, and **Python 2.7** (as **Flask**) in a single container. Optionally with Alpine Linux. +**Docker** image with **uWSGI** and **Nginx** for web applications in **Python 3.6** and above, and **Python 2.7** (as **Flask**) in a single container. Optionally with Alpine Linux. ## Description diff --git a/docker-images/python3.5.dockerfile b/docker-images/python3.5.dockerfile deleted file mode 100644 index d2dd2d7..0000000 --- a/docker-images/python3.5.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM python:3.5 - -LABEL maintainer="Sebastian Ramirez " - -COPY install-nginx-debian.sh / - -RUN bash /install-nginx-debian.sh - -EXPOSE 80 - -# Expose 443, in case of LTS / HTTPS -EXPOSE 443 - -# Install uWSGI -RUN pip install uwsgi - -# Remove default configuration from Nginx -RUN rm /etc/nginx/conf.d/default.conf -# Copy the base uWSGI ini file to enable default dynamic uwsgi process number -COPY uwsgi.ini /etc/uwsgi/ - -# Install Supervisord -RUN apt-get update && apt-get install -y supervisor \ -&& rm -rf /var/lib/apt/lists/* -# Custom Supervisord config -COPY supervisord-debian.conf /etc/supervisor/conf.d/supervisord.conf - -# Which uWSGI .ini file should be used, to make it customizable -ENV UWSGI_INI /app/uwsgi.ini - -# By default, run 2 processes -ENV UWSGI_CHEAPER 2 - -# By default, when on demand, run up to 16 processes -ENV UWSGI_PROCESSES 16 - -# By default, allow unlimited file sizes, modify it to limit the file sizes -# To have a maximum of 1 MB (Nginx's default) change the line to: -# ENV NGINX_MAX_UPLOAD 1m -ENV NGINX_MAX_UPLOAD 0 - -# By default, Nginx will run a single worker process, setting it to auto -# will create a worker for each CPU core -ENV NGINX_WORKER_PROCESSES 1 - -# By default, Nginx listens on port 80. -# To modify this, change LISTEN_PORT environment variable. -# (in a Dockerfile or with an option for `docker run`) -ENV LISTEN_PORT 80 - -# Copy start.sh script that will check for a /app/prestart.sh script and run it before starting the app -COPY start.sh /start.sh -RUN chmod +x /start.sh - -# Copy the entrypoint that will generate Nginx additional configs -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] - -# Add demo app -COPY ./app /app -WORKDIR /app - -# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations) -# And then will start Supervisor, which in turn will start Nginx and uWSGI -CMD ["/start.sh"] diff --git a/scripts/process_all.py b/scripts/process_all.py index 1e18a27..efde2bb 100644 --- a/scripts/process_all.py +++ b/scripts/process_all.py @@ -6,7 +6,6 @@ {"NAME": "latest", "PYTHON_VERSION": "3.7"}, {"NAME": "python3.7", "PYTHON_VERSION": "3.7"}, {"NAME": "python3.6", "PYTHON_VERSION": "3.6"}, - {"NAME": "python3.5", "PYTHON_VERSION": "3.5"}, {"NAME": "python2.7", "PYTHON_VERSION": "2.7"}, {"NAME": "python3.6-alpine3.9", "PYTHON_VERSION": "3.6"}, {"NAME": "python3.6-alpine3.8", "PYTHON_VERSION": "3.6"},