Fixes to local dev docker-compose

Author: brianjp93

.python-version

@@ -10,7 +10,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/local/Dockerfile
-    command: uv run manage.py runserver_plus 0.0.0.0:8000
+    command: python manage.py runserver_plus 0.0.0.0:8000 --nopin
     ports:
       - "8000:8000"
     volumes:
@@ -27,7 +27,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/local/Dockerfile
-    command: uv run celery -A lolsite worker -l info
+    command: celery -A lolsite worker -l info
     volumes:
       - .:/code
     links:
@@ -41,7 +41,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/local/Dockerfile
-    command: uv run celery -A lolsite beat -l INFO
+    command: celery -A lolsite beat -l INFO
     volumes:
       - .:/code
     links:
@@ -57,7 +57,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/local/Dockerfile
-    command: uv run tailwindcss -i ./lolsite/static/src/main.css -o ./lolsite/static/src/output.css --minify --watch
+    command: tailwindcss -i ./lolsite/static/src/main.css -o ./lolsite/static/src/output.css --minify --watch
     volumes:
       - .:/code
     env_file: .docker_env

docker-compose.yml

@@ -1,4 +1,5 @@
-FROM ghcr.io/astral-sh/uv:alpine
+FROM python:3.14-alpine
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 ENV UV_NO_DEV=1
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONFAULTHANDLER=1
@@ -7,4 +8,9 @@ WORKDIR /code
 COPY pyproject.toml uv.lock ./
 
 RUN apk add --no-cache alpine-sdk gcc g++ python3-dev jpeg-dev zlib-dev
-RUN uv sync --locked
+
+# Running uv run manage.py runserver results in semaphore leaks that I do not understand
+# when I run the server directly with the system python, I do not run into the same issues,
+# so I am installing to the system python rather than `uv sync` and `uv run`
+RUN uv export > requirements.txt
+RUN uv pip install -r requirements.txt --system

docker/local/Dockerfile

@@ -17,7 +17,6 @@
 import logging
 
 logger = logging.getLogger(__name__)
-CACHE_TIME = 60 * 60 * 48
 
 
 class MatchSerializer(serializers.ModelSerializer):

match/serializers.py

@@ -2,7 +2,7 @@
 import time
 import json
 from datetime import timedelta, datetime
-from multiprocessing.pool import ThreadPool
+from concurrent.futures import ThreadPoolExecutor
 from functools import partial
 from typing import Optional, assert_never
 from urllib3.exceptions import MaxRetryError
@@ -282,8 +282,8 @@ def import_recent_matches(
                 if len(jobs) == 1:
                     pool_match_import(*jobs[0], close_connections=False)
                 else:
-                    with ThreadPool(processes=min(10, len(jobs))) as pool:
-                        pool.starmap(pool_match_import, jobs)
+                    with ThreadPoolExecutor(max_workers=min(10, len(jobs))) as executor:
+                        executor.map(lambda args: pool_match_import(*args), jobs)
                 logger.info(
                     f"ThreadPool match import: {time.perf_counter() - start_time}"
                 )
@@ -746,14 +746,13 @@ def get_player_ranks(summoner_list, threshold_days=1, sync=True):
             for x in jobs:
                 pt.import_positions(*x)
         else:
-            with ThreadPool(processes=10) as pool:
-
+            with ThreadPoolExecutor(max_workers=10) as executor:
                 def pool_position_import(a, b):
                     pt.import_positions(a, b)
                     connections.close_all()
 
                 start_time = time.perf_counter()
-                pool.starmap(pool_position_import, jobs)
+                executor.map(lambda args: pool_position_import(*args), jobs)
                 logger.info(
                     f"ThreadPool positions import: {time.perf_counter() - start_time}"
                 )