Update Dockerfile to use UV

Author: phalt

.github/workflows/database.yml

@@ -57,8 +57,6 @@ jobs:
         uses: actions/checkout@v5
         with:
           submodules: recursive
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
       - name: Build
         run: |
           docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d

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

@@ -23,11 +23,12 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ## Table of Contents
 
-- [Setup](#setup)
+- [Table of Contents](#table-of-contents)
+- [Setup    ](#setup---)
 - [Database setup](#database-setup)
-- [Docker and Compose](#docker-and-compose)
-- [GraphQL](#graphql)
-- [Kubernetes](#kubernetes)
+- [Docker and Compose    ](#docker-and-compose---)
+- [GraphQL    ](#graphql---)
+- [Kubernetes    ](#kubernetes---)
 - [Wrappers](#wrappers)
 - [Donations](#donations)
 - [Join Us On Slack!](#join-us-on-slack)
@@ -99,8 +100,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 +152,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

@@ -1,33 +1,32 @@
 FROM python:3.13.7-alpine AS builder
 
 ENV PYTHONUNBUFFERED=1
+ENV DJANGO_SETTINGS_MODULE='config.docker-compose'
 
 RUN mkdir /code
 WORKDIR /code
 
-ADD requirements.txt /code/
-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
-
-FROM python:3.13.7-alpine
-
-ENV PYTHONUNBUFFERED=1
-ENV DJANGO_SETTINGS_MODULE='config.docker-compose'
+# Install UV
+RUN apk add --no-cache curl
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 
-RUN mkdir /code
-WORKDIR /code
+# Add UV to PATH for this stage
+ENV PATH="/root/.local/bin:$PATH"
 
-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 dependency files
+ADD pyproject.toml uv.lock* /code/
 
-ADD . /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 && \
+    uv sync --frozen
 
 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'
 ```

Resources/scripts/wait.sh

@@ -8,10 +8,12 @@ wait_for_http() {
     echo "Waiting for $url"
     while [ "$(date +%s)" -lt "$end_time" ]; do  # Loop until interval has elapsed.
         sleep 2
+        echo "Checking $url"
         if [ "$(curl -s -o /dev/null -L -w '%{http_code}' "$url")" == "200" ]; then
             success='true'
             break
         fi
+        echo "$(curl -s -o /dev/null -L -w '%{http_code}' "$url")"
     done
     if [ "$success" = 'true' ]; then
         exit 0
@@ -20,4 +22,4 @@ wait_for_http() {
     fi
 }
 
-wait_for_http "${1:-http://localhost/api/v2/}"
+wait_for_http "${1:-http://localhost/api/v2/}"

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",
 ]