Update Docker / k8s to use uv

Context:
- We needed to explicilty include psycopg-binary here
- Rest of the changes are just replacements of python -> uv run

Author: phalt

.github/workflows/docker-k8s.yml

@@ -1,4 +1,6 @@
 name: Container
+# These workflows are intended to check that the Docker and Kubernetes
+# configurations work as expected in a local development environment.
 
 on:
   pull_request:

Makefile

@@ -47,16 +47,16 @@ docker-up:  # (Docker) Create services/volumes/networks
 	docker compose up -d
 
 docker-migrate:  # (Docker) Run any pending migrations
-	docker compose exec -T app python manage.py migrate ${docker_config}
+	docker compose --verbose exec -T app uv run manage.py migrate ${docker_config}
 
 docker-build-db:  # (Docker) Build the database
-	docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${docker_config}'
+	docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | uv run manage.py shell ${docker_config}'
 
 docker-make-migrations:  # (Docker) Create migrations files if schema has changed
-	docker compose exec -T app sh -c 'python manage.py makemigrations ${docker_config}'
+	docker compose exec -T app sh -c 'uv run manage.py makemigrations ${docker_config}'
 
 docker-flush-db:  # (Docker) Removes all the data present in the database but preserves tables and migrations
-	docker compose exec -T app sh -c 'python manage.py flush --no-input ${docker_config}'
+	docker compose exec -T app sh -c 'uv run manage.py flush --no-input ${docker_config}'
 
 docker-destroy-db:  # (Docker) Removes the volume where the database is installed on, alongside to the container itself
 	docker rm -f pokeapi_db_1
@@ -72,7 +72,7 @@ docker-down:  # (Docker) Stop and removes containers and networks
 	docker compose down
 
 docker-test:  # (Docker) Run tests
-	docker compose exec -T app python manage.py test ${local_config}
+	docker compose exec -T app uv run manage.py test ${local_config}
 
 docker-prod:
 	docker compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
@@ -130,10 +130,10 @@ kustomize-ga-apply:  # (Kustomize) Run kubectl apply -k on the connected k8s clu
 	kubectl apply -k Resources/k8s/kustomize/ga/
 
 k8s-migrate:  # (k8s) Run any pending migrations
-	kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate ${docker_config}
+	kubectl exec --namespace pokeapi deployment/pokeapi -- uv run manage.py migrate ${docker_config}
 
 k8s-build-db:  # (k8s) Build the database
-	kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell ${docker_config}'
+	kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | uv run manage.py shell ${docker_config}'
 
 k8s-delete:  # (k8s) Delete pokeapi namespace
 	kubectl delete namespace pokeapi

README.md

@@ -99,8 +99,8 @@ If you don't have `make` on your machine you can use the following commands
 
 ```sh
 docker compose up -d
-docker compose exec -T app python manage.py migrate --settings=config.docker-compose
-docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose'
+docker compose exec -T app uv run manage.py migrate --settings=config.docker-compose
+docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | uv run manage.py shell --settings=config.docker-compose'
 ```
 
 Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemon/bulbasaur/](http://localhost/api/v2/pokemon/bulbasaur/) on port `80`.
@@ -151,8 +151,8 @@ Configure `kubectl` to point to a cluster and then run the following commands to
 kubectl apply -k Resources/k8s/kustomize/base/
 kubectl config set-context --current --namespace pokeapi # (Optional) Set pokeapi ns as the working ns
 # Wait for the cluster to spin up
-kubectl exec --namespace pokeapi deployment/pokeapi -- python manage.py migrate --settings=config.docker-compose # Migrate the DB
-kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' # Build the db
+kubectl exec --namespace pokeapi deployment/pokeapi -- uv run manage.py migrate --settings=config.docker-compose # Migrate the DB
+kubectl exec --namespace pokeapi deployment/pokeapi -- sh -c 'echo "from data.v2.build import build_all; build_all()" | uv run manage.py shell --settings=config.docker-compose' # Build the db
 kubectl wait --namespace pokeapi --timeout=120s --for=condition=complete job/load-graphql # Wait for Graphql configuration job to finish
 ```
 

Resources/docker/app/Dockerfile

@@ -5,11 +5,21 @@ ENV PYTHONUNBUFFERED=1
 RUN mkdir /code
 WORKDIR /code
 
-ADD requirements.txt /code/
+# Install UV
+RUN apk add --no-cache curl
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+
+# Add UV to PATH for this stage
+ENV PATH="/root/.local/bin:$PATH"
+
+# Copy dependency files
+ADD pyproject.toml uv.lock* /code/
+
+# Install dependencies
 RUN apk add --no-cache postgresql-libs libstdc++
 RUN apk add --no-cache --virtual .build-deps gcc g++ musl-dev \
     postgresql-dev binutils rust cargo && \
-    python3 -m pip install -r requirements.txt --no-cache-dir
+    uv sync --frozen
 
 FROM python:3.13.7-alpine
 
@@ -19,15 +29,23 @@ ENV DJANGO_SETTINGS_MODULE='config.docker-compose'
 RUN mkdir /code
 WORKDIR /code
 
-COPY --from=builder /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
-COPY --from=builder /usr/local/bin /usr/local/bin
+# Copy UV and virtual environment from builder
+COPY --from=builder /root/.local /root/.local
+COPY --from=builder /code/.venv /code/.venv
+
+# Add UV to PATH
+ENV PATH="/root/.local/bin:$PATH"
+
+# Install runtime dependencies
+RUN apk add --no-cache postgresql-libs libstdc++
 
+# Copy application code
 ADD . /code/
 
 RUN addgroup -g 1000 -S pokeapi && \
     adduser -u 1000 -S pokeapi -G pokeapi
 USER pokeapi
 
-CMD ["gunicorn", "config.wsgi:application", "-c", "gunicorn.conf.py"]
+CMD ["uv", "run", "gunicorn", "config.wsgi:application", "-c", "gunicorn.conf.py"]
 
 EXPOSE 80

Resources/docker/app/README.md

@@ -46,6 +46,6 @@ Pokémon data isn't automatically present in this image. All Pokémon data is pe
 When the container is up and running, run the following shell commands:
 
 ```sh
-docker exec pokeapi python manage.py migrate --settings=config.docker-compose
-docker exec pokeapi sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose'
+docker exec pokeapi uv run manage.py migrate --settings=config.docker-compose
+docker exec pokeapi sh -c 'echo "from data.v2.build import build_all; build_all()" | uv run manage.py shell --settings=config.docker-compose'
 ```

data/v2/build.py

@@ -1,6 +1,6 @@
 #  To build out the data you'll need to jump into the Django shell
 #
-#     $ python manage.py shell
+#     $ uv run manage.py shell
 #
 #  and run the build script with
 #

pyproject.toml

@@ -14,6 +14,7 @@ dependencies = [
     "drf-spectacular==0.29.0",
     "gunicorn==23.0.0",
     "psycopg==3.3.2",
+    "psycopg2-binary>=2.9.11",
     "ruff>=0.14.14",
     "ty>=0.0.14",
 ]