From c857fdc3f67832216c49f84f33397e4105d9cc38 Mon Sep 17 00:00:00 2001 From: Scott Cranfill Date: Tue, 3 Nov 2026 23:14:50 +0000 Subject: [PATCH 1/2] chore: Upgrade base image to python:3.14-trixie --- README.md | 2 +- appcontainer/Dockerfile | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5b21e53..00e8ecb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A base [Docker image](https://www.docker.com/) for Cal-ITP Python web applicatio ## Features -- Base image `python:3.12-bookworm` +- Base image `python:3.14-trixie` - Image configured with non-`root` user (`calitp` by default) - `nginx` configured as a reverse proxy listening on container port `8000` - `gunicorn` configured as a WSGI application server, communicates with `nginx` over Unix socket diff --git a/appcontainer/Dockerfile b/appcontainer/Dockerfile index 53bea28..44bac5e 100644 --- a/appcontainer/Dockerfile +++ b/appcontainer/Dockerfile @@ -1,16 +1,13 @@ # declare default build args for later stages -ARG PYTHON_VERSION=3.12 \ +ARG PYTHON_VERSION=3.14 \ PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ USER=calitp \ USER_UID=1000 \ USER_GID=1000 -# we can start using debian 13 as soon as an ubuntu 26.04 hosted github actions runner image is available -# https://github.com/actions/runner-images -# https://launchpad.net/ubuntu/resolute/+package/gettext -# https://packages.debian.org/trixie/gettext -FROM python:3.12-bookworm +# the version of gettext packaged with Debian 13 (AKA "trixie") matches Ubuntu 26.04 (our hosted Github Actions runner) +FROM python:3.14-trixie # renew top-level args in this stage ARG PYTHON_VERSION \ From 27a661772868c44a88352644e33af44e4d06d374 Mon Sep 17 00:00:00 2001 From: Scott Cranfill Date: Wed, 4 Nov 2026 14:56:34 +0000 Subject: [PATCH 2/2] docs: Change main branch reference to a version placeholder --- docs/guides/testing-changes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/testing-changes.md b/docs/guides/testing-changes.md index ab4e6b1..180f8e4 100644 --- a/docs/guides/testing-changes.md +++ b/docs/guides/testing-changes.md @@ -16,7 +16,7 @@ In your `benefits` repository: 1. In the benefits Dockerfile: ```bash - ghcr.io/cal-itp/docker-python-web:main + ghcr.io/cal-itp/docker-python-web: # becomes docker-python-web:app ``` @@ -38,7 +38,7 @@ In your `eligibility-server` repository 1. In the eligibility-server Dockerfile: ```bash - ghcr.io/cal-itp/docker-python-web:main + ghcr.io/cal-itp/docker-python-web: # becomes docker-python-web:app ```