diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 31dccda..db61089 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,12 +21,6 @@ jobs: python_version: "3.8" - name: python3.7 python_version: "3.7" - - name: python3.9-alpine3.13 - python_version: "3.9" - - name: python3.8-alpine3.11 - python_version: "3.8" - - name: python3.7-alpine3.8 - python_version: "3.7" fail-fast: true runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9308ead..c733555 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,12 +25,6 @@ jobs: python_version: "3.8" - name: python3.7 python_version: "3.7" - - name: python3.9-alpine3.13 - python_version: "3.9" - - name: python3.8-alpine3.11 - python_version: "3.8" - - name: python3.7-alpine3.8 - python_version: "3.7" fail-fast: true runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 32cbc87..8f0002b 100644 --- a/README.md +++ b/README.md @@ -7,23 +7,22 @@ * [`python3.7`, _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.7.dockerfile) * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.6.dockerfile) -## Discouraged tags - -* [`python3.9-alpine3.13` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.9-alpine3.13.dockerfile) -* [`python3.8-alpine3.11` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.8-alpine3.11.dockerfile) -* [`python3.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.7-alpine3.8.dockerfile) -* [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile) - ## Deprecated tags -🚨 These tags are no longer supported or maintained, they are removed from the GitHub repository, but the last version pushed is still available in Docker Hub. +🚨 These tags are no longer supported or maintained, they are removed from the GitHub repository, but the last versions pushed might still be available in Docker Hub if anyone has been pulling them: +* `python3.9-alpine3.13` +* `python3.8-alpine3.11` +* `python3.7-alpine3.8` * `python3.6` * `python3.6-alpine3.8` * `python2.7` -The last date tags for deprecated Python versions are: +The last date tags for these versions are: +* `python3.9-alpine3.13-2024-03-11` +* `python3.8-alpine3.11-2024-03-11` +* `python3.7-alpine3.8-2024-03-11` * `python3.6-2022-11-25` * `python3.6-alpine3.8-2022-11-25` * `python2.7-2022-11-25` @@ -34,7 +33,7 @@ The last date tags for deprecated Python versions are: # meinheld-gunicorn -[**Docker**](https://www.docker.com/) image with [**Meinheld**](http://meinheld.org/) managed by [**Gunicorn**](https://gunicorn.org/) for high-performance web applications in **[Python](https://www.python.org/)**, with performance auto-tuning. Optionally with Alpine Linux. +[**Docker**](https://www.docker.com/) image with [**Meinheld**](http://meinheld.org/) managed by [**Gunicorn**](https://gunicorn.org/) for high-performance web applications in **[Python](https://www.python.org/)**, with performance auto-tuning. **GitHub repo**: [https://github.com/tiangolo/meinheld-gunicorn-docker](https://github.com/tiangolo/meinheld-gunicorn-docker) diff --git a/docker-images/python3.7-alpine3.8.dockerfile b/docker-images/python3.7-alpine3.8.dockerfile deleted file mode 100644 index 127de0a..0000000 --- a/docker-images/python3.7-alpine3.8.dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM python:3.7-alpine3.8 - -LABEL maintainer="Sebastian Ramirez " - -COPY requirements.txt /tmp/requirements.txt - -RUN apk add --no-cache --virtual .build-deps gcc libc-dev \ - && pip install --no-cache-dir -r /tmp/requirements.txt \ - && apk del .build-deps gcc libc-dev - -COPY ./entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -COPY ./start.sh /start.sh -RUN chmod +x /start.sh - -COPY ./gunicorn_conf.py /gunicorn_conf.py - -COPY ./app /app -WORKDIR /app/ - -ENV PYTHONPATH=/app - -EXPOSE 80 - -ENTRYPOINT ["/entrypoint.sh"] - -# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations) -# And then will start Gunicorn with Meinheld -CMD ["/start.sh"] diff --git a/docker-images/python3.8-alpine3.11.dockerfile b/docker-images/python3.8-alpine3.11.dockerfile deleted file mode 100644 index 5bd40a2..0000000 --- a/docker-images/python3.8-alpine3.11.dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM python:3.8-alpine3.11 - -LABEL maintainer="Sebastian Ramirez " - -COPY requirements.txt /tmp/requirements.txt - -RUN apk add --no-cache --virtual .build-deps gcc libc-dev \ - && pip install --no-cache-dir -r /tmp/requirements.txt \ - && apk del .build-deps gcc libc-dev - -COPY ./entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -COPY ./start.sh /start.sh -RUN chmod +x /start.sh - -COPY ./gunicorn_conf.py /gunicorn_conf.py - -COPY ./app /app -WORKDIR /app/ - -ENV PYTHONPATH=/app - -EXPOSE 80 - -ENTRYPOINT ["/entrypoint.sh"] - -# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations) -# And then will start Gunicorn with Meinheld -CMD ["/start.sh"] diff --git a/docker-images/python3.9-alpine3.13.dockerfile b/docker-images/python3.9-alpine3.13.dockerfile deleted file mode 100644 index d33a603..0000000 --- a/docker-images/python3.9-alpine3.13.dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM python:3.9-alpine3.13 - -LABEL maintainer="Sebastian Ramirez " - -COPY requirements.txt /tmp/requirements.txt - -RUN apk add --no-cache --virtual .build-deps gcc libc-dev \ - && pip install --no-cache-dir -r /tmp/requirements.txt \ - && apk del .build-deps gcc libc-dev - -COPY ./entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -COPY ./start.sh /start.sh -RUN chmod +x /start.sh - -COPY ./gunicorn_conf.py /gunicorn_conf.py - -COPY ./app /app -WORKDIR /app/ - -ENV PYTHONPATH=/app - -EXPOSE 80 - -ENTRYPOINT ["/entrypoint.sh"] - -# Run the start script, it will check for an /app/prestart.sh script (e.g. for migrations) -# And then will start Gunicorn with Meinheld -CMD ["/start.sh"] diff --git a/pyproject.toml b/pyproject.toml index 759f69a..b6c8799 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "meinheld-gunicorn-docker" version = "0.1.0" -description = "Docker image with Meinheld managed by Gunicorn for high-performance web applications in Python with performance auto-tuning. Optionally with Alpine Linux." +description = "Docker image with Meinheld managed by Gunicorn for high-performance web applications in Python with performance auto-tuning." authors = ["Sebastián Ramírez "] license = "MIT" diff --git a/scripts/process_all.py b/scripts/process_all.py index 13b8755..927e9a3 100644 --- a/scripts/process_all.py +++ b/scripts/process_all.py @@ -7,9 +7,6 @@ {"NAME": "python3.9", "PYTHON_VERSION": "3.9"}, {"NAME": "python3.8", "PYTHON_VERSION": "3.8"}, {"NAME": "python3.7", "PYTHON_VERSION": "3.7"}, - {"NAME": "python3.9-alpine3.13", "PYTHON_VERSION": "3.9"}, - {"NAME": "python3.8-alpine3.11", "PYTHON_VERSION": "3.8"}, - {"NAME": "python3.7-alpine3.8", "PYTHON_VERSION": "3.7"}, ] start_with = os.environ.get("START_WITH")