From 1bc90814f48c28390891305b706ef559d8bbeb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Sun, 8 Sep 2024 23:02:23 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Add=20support=20for=20Pyth?= =?UTF-8?q?on=203.12=20(#228)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 +- .github/workflows/test.yml | 4 +- README.md | 15 ++++--- docker-images/python3.12.dockerfile | 70 +++++++++++++++++++++++++++++ scripts/process_all.py | 3 +- 5 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 docker-images/python3.12.dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8c9729d..d280575 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,9 @@ jobs: matrix: image: - name: latest - python_version: "3.11" + python_version: "3.12" + - name: python3.12 + python_version: "3.12" - name: python3.11 python_version: "3.11" - name: python3.10 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f55f54..0a99e06 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,9 @@ jobs: matrix: image: - name: latest - python_version: "3.11" + python_version: "3.12" + - name: python3.12 + python_version: "3.12" - name: python3.11 python_version: "3.11" - name: python3.10 diff --git a/README.md b/README.md index b152a16..1c2472b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Supported tags and respective `Dockerfile` links -* [`python3.11`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.11.dockerfile) +* [`python3.12`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.12.dockerfile) +* [`python3.11`, _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.11.dockerfile) * [`python3.10`, _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.10.dockerfile) * [`python3.9`, _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.9.dockerfile) * [`python3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/docker-images/python3.8.dockerfile) @@ -141,7 +142,7 @@ You can use this image as a base image for other images. Assuming you have a file `requirements.txt`, you could have a `Dockerfile` like this: ```Dockerfile -FROM tiangolo/uwsgi-nginx:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 COPY ./requirements.txt /app/requirements.txt @@ -167,7 +168,7 @@ If you need to use a directory for your app different than `/app`, you can overr For example, if you needed to have your application directory in `/application` instead of `/app`, your `Dockerfile` would look like: ```Dockerfile -FROM tiangolo/uwsgi-nginx:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 ENV UWSGI_INI /application/uwsgi.ini @@ -199,7 +200,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:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 ENV UWSGI_CHEAPER 4 ENV UWSGI_PROCESSES 64 @@ -218,7 +219,7 @@ For example, if you wanted to set the maximum upload file size to 1 MB (the defa So, your `Dockerfile` would look something like: ```Dockerfile -FROM tiangolo/uwsgi-nginx:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 ENV NGINX_MAX_UPLOAD 1m @@ -236,7 +237,7 @@ You might also need to create the respective `EXPOSE` Docker instruction. You can do that in your `Dockerfile`, it would look something like: ```Dockerfile -FROM tiangolo/uwsgi-nginx:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 ENV LISTEN_PORT 8080 @@ -290,7 +291,7 @@ or you can set it to the keyword `auto` and it will try to autodetect the number For example, using `auto`, your Dockerfile could look like: ```Dockerfile -FROM tiangolo/uwsgi-nginx:python3.11 +FROM tiangolo/uwsgi-nginx:python3.12 ENV NGINX_WORKER_PROCESSES auto diff --git a/docker-images/python3.12.dockerfile b/docker-images/python3.12.dockerfile new file mode 100644 index 0000000..be45008 --- /dev/null +++ b/docker-images/python3.12.dockerfile @@ -0,0 +1,70 @@ +FROM python:3.12-bullseye + +LABEL maintainer="Sebastian Ramirez " + +ENV PYTHONDONTWRITEBYTECODE=1 +ENV PYTHONUNBUFFERED=1 + +COPY install-nginx-debian.sh / + +RUN bash /install-nginx-debian.sh + +# Install requirements +COPY requirements.txt /tmp/requirements.txt +RUN pip install --no-cache-dir -r /tmp/requirements.txt + +# 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 + +# Copy stop-supervisor.sh to kill the supervisor and substasks on app failure +COPY stop-supervisor.sh /etc/supervisor/stop-supervisor.sh +RUN chmod +x /etc/supervisor/stop-supervisor.sh + +# 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 eb4782a..15d9a16 100644 --- a/scripts/process_all.py +++ b/scripts/process_all.py @@ -3,7 +3,8 @@ import sys environments = [ - {"NAME": "latest", "PYTHON_VERSION": "3.11"}, + {"NAME": "latest", "PYTHON_VERSION": "3.12"}, + {"NAME": "python3.12", "PYTHON_VERSION": "3.12"}, {"NAME": "python3.11", "PYTHON_VERSION": "3.11"}, {"NAME": "python3.10", "PYTHON_VERSION": "3.10"}, {"NAME": "python3.9", "PYTHON_VERSION": "3.9"},