From 87d20b0bb80366af0a5dc61af0eed0d88773e962 Mon Sep 17 00:00:00 2001
From: Michael Manganiello <adamantike@users.noreply.github.com>
Date: Sun, 6 Jul 2025 15:05:06 -0300
Subject: [PATCH] fix: Correctly use Python 3.13 in Docker image

The `production-stage` stage was depending on the `python3` package from
Alpine, which at the moment of writing is still Python 3.12.

To avoid relying on Alpine's package and releases, we now copy the
Python installation directly from its official Docker image.

Other options were tested but did not work:
- Trying to install Python 3.13 using `apk`. As mentioned, Alpine does
  not support Python 3.13 yet.
- Installing Python 3.13 using `pyenv`. The installation worked, but the
  generated image was too large. Related `pyenv` discussion:
  https://github.com/orgs/pyenv/discussions/2868
- Installing Python 3.13 using `uv`. Only worked for `amd64`
  architecture, but the installation failed on `arm64`.
---
 docker/Dockerfile | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 52a8a8812..04f7d2d33 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,6 +17,9 @@ ARG NGINX_VERSION=1.29.0
 ARG NODE_VERSION=20.19
 ARG PYTHON_VERSION=3.13
 
+# Alias stages:
+FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} AS python-alias
+
 
 FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS frontend-build
 WORKDIR /front
@@ -28,7 +31,7 @@ COPY ./frontend ./
 RUN npm run build
 
 
-FROM python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} AS backend-build
+FROM python-alias AS backend-build
 
 # git is needed to install streaming-form-data fork
 # linux-headers is needed to install py7zr
@@ -47,12 +50,12 @@ COPY --from=ghcr.io/astral-sh/uv:0.7.19 /uv /uvx /bin/
 WORKDIR /src
 
 COPY ./pyproject.toml ./uv.lock /src/
-RUN uv sync --frozen --no-cache
+RUN uv sync --locked --no-cache
 
 
 FROM backend-build AS backend-dev-build
 
-RUN uv sync --frozen --no-cache --all-extras
+RUN uv sync --locked --no-cache --all-extras
 
 
 FROM alpine:${ALPINE_VERSION} AS rahasher-build
@@ -136,10 +139,20 @@ RUN apk add --no-cache \
     mariadb-connector-c \
     libpq \
     p7zip \
-    python3 \
     tzdata \
     valkey
 
+# Add Python by copying it from the official Docker image. This way, we don't rely on Alpine's
+# Python version, which could not be the same as the one used in the backend build stage.
+# TODO: Replace with a bundled installation of Python using `uv`, when it is supported.
+#       Related issue: https://github.com/astral-sh/uv/issues/7865
+ARG PYTHON_VERSION
+COPY --from=python-alias /usr/lib/* /usr/lib/
+COPY --from=python-alias /usr/local/bin/* /usr/local/bin/
+COPY --from=python-alias /usr/local/include/python${PYTHON_VERSION} /usr/local/include/python${PYTHON_VERSION}
+COPY --from=python-alias /usr/local/lib/libpython* /usr/local/lib/
+COPY --from=python-alias /usr/local/lib/python${PYTHON_VERSION} /usr/local/lib/python${PYTHON_VERSION}
+
 COPY --from=rahasher-build /RALibretro/bin64/RAHasher /usr/bin/RAHasher
 COPY --from=nginx-build ./nginx/objs/ngx_http_zip_module.so /usr/lib/nginx/modules/
 COPY --from=frontend-build /front/dist ${WEBSERVER_FOLDER}
@@ -169,8 +182,6 @@ FROM scratch AS slim-image
 COPY --from=production-stage / /
 
 COPY --from=backend-build /src/.venv /src/.venv
-# Fix virtualenv link to python binary
-RUN ln -sf "$(which python)" /src/.venv/bin/python
 
 ENV PATH="/src/.venv/bin:${PATH}"
 
@@ -193,11 +204,7 @@ COPY --from=emulator-stage /ruffle ${WEBSERVER_FOLDER}/assets/ruffle
 
 FROM slim-image AS dev-slim
 COPY --from=backend-dev-build /src/.venv /src/.venv
-# Fix virtualenv link to python binary
-RUN ln -sf "$(which python)" /src/.venv/bin/python
 
 
 FROM full-image AS dev-full
 COPY --from=backend-dev-build /src/.venv /src/.venv
-# Fix virtualenv link to python binary
-RUN ln -sf "$(which python)" /src/.venv/bin/python