From 3a4b867fc5c34a67a0a31bb4548c5f53d78ba4fa Mon Sep 17 00:00:00 2001
From: "sentry-junior[bot]"
 <264270552+sentry-junior[bot]@users.noreply.github.com>
Date: Sat, 24 Oct 2026 00:31:32 +0000
Subject: [PATCH] build: Bump Python to 3.13.17 and copy uv from its image
 Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com>

---
 .github/actions/setup-sentry/action.yml | 2 +-
 .python-version                         | 2 +-
 self-hosted/Dockerfile                  | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-sentry/action.yml b/.github/actions/setup-sentry/action.yml
index ca010568af35..a806960c3758 100644
--- a/.github/actions/setup-sentry/action.yml
+++ b/.github/actions/setup-sentry/action.yml
@@ -10,7 +10,7 @@ inputs:
   python-version:
     description: 'python version to install'
     required: false
-    default: '3.13.15'
+    default: '3.13.17'
   mode:
     description: 'Mode to bring up by new devservices'
     required: false
diff --git a/.python-version b/.python-version
index 4de75f8d77a3..67d7dc557636 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.13.15
+3.13.17
diff --git a/self-hosted/Dockerfile b/self-hosted/Dockerfile
index e06cc7ec32c5..ff5bee8eff08 100644
--- a/self-hosted/Dockerfile
+++ b/self-hosted/Dockerfile
@@ -13,7 +13,7 @@ ADD --chmod=755 \
 ARG TARGETARCH
 FROM odiff-${TARGETARCH} AS odiff
 
-FROM ghcr.io/getsentry/image-mirror-library-python:3.13.15-slim-trixie AS application
+FROM ghcr.io/getsentry/image-mirror-library-python:3.13.17-slim-trixie AS application
 
 LABEL maintainer="oss@sentry.io"
 LABEL org.opencontainers.image.title="Sentry"
@@ -42,10 +42,13 @@ ENV PATH="/.venv/bin:$PATH" UV_PROJECT_ENVIRONMENT=/.venv \
     PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1 \
     UV_COMPILE_BYTECODE=1 UV_NO_CACHE=1
 
-RUN python3 -m pip install --index-url 'https://pypi.devinfra.sentry.io/simple' 'uv==0.13.5'
+COPY --from=ghcr.io/astral-sh/uv:0.13.5@sha256:32a7bb39b496babbd997b0a39a4d66c126bdaf5661b302bf6f06abda8deca6ff \
+    /uv /usr/local/bin/uv
 
 # We don't want uv-managed python, we want to use python from the image.
 # We only want to use uv to manage dependencies.
+# Keep pip in this venv: getsentry/self-hosted's sentry/Dockerfile and users'
+# enhance-image.sh `pip install` plugins into it.
 RUN python3 -m venv /.venv
 
 ENV \
@@ -103,7 +106,7 @@ USER 0
 # The distroless base has Python at /usr/bin, not /usr/local/bin.
 RUN ln -sf /usr/bin/python3.13 /.venv/bin/python3
 
-FROM us-docker.pkg.dev/sentryio/dhi-mirror/python:3.13.15-debian13 AS distroless
+FROM us-docker.pkg.dev/sentryio/dhi-mirror/python:3.13.16-debian13 AS distroless
 
 LABEL maintainer="oss@sentry.io"
 LABEL org.opencontainers.image.title="Sentry"