chore: migrate to uv

Author: gardenerik

.dockerignore

@@ -0,0 +1,4 @@
+__pycache__
+.venv
+.git
+.env

Dockerfile

@@ -1,42 +1,33 @@
-FROM node:22.5.1-alpine AS cssbuild
+FROM node:24-alpine AS cssbuild
 
 WORKDIR /app
 
-COPY package.json package-lock.json ./
-RUN npm install
+COPY package.json pnpm-lock.yaml ./
+RUN npm install -g pnpm && \
+    pnpm install
 
-COPY . .
-RUN npm run css-prod
-CMD ["npm", "run", "css-dev"]
+COPY bullet ./bullet
+COPY css ./css
+RUN pnpm run build
+CMD ["pnpm", "run", "watch"]
 
-FROM python:3.12-slim-bookworm
-WORKDIR /app
-
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-ENV DEBUG 0
+FROM ghcr.io/trojsten/django-docker:v6
 
+USER root
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt update \
-    && apt -y upgrade \
-    && apt -y install libmaxminddb0 gettext librsvg2-bin build-essential caddy \
+    && apt install -y libmaxminddb0 gettext librsvg2-bin build-essential \
     && apt -y clean \
     && rm -rf /var/lib/apt/lists/*
+USER appuser
 
-ARG MULTIRUN_VERSION=1.1.3
-ADD https://github.com/nicolas-van/multirun/releases/download/${MULTIRUN_VERSION}/multirun-x86_64-linux-gnu-${MULTIRUN_VERSION}.tar.gz /tmp
-RUN tar -xf /tmp/multirun-x86_64-linux-gnu-${MULTIRUN_VERSION}.tar.gz \
-    && mv multirun /bin \
-    && rm /tmp/*
+COPY pyproject.toml uv.lock ./
+RUN uv sync --frozen
 
-RUN pip install --upgrade pipenv
-COPY Pipfile Pipfile.lock ./
-RUN pipenv install --system --dev --deploy
+COPY --chown=appuser:appuser . .
+COPY --chown=appuser:appuser --from=cssbuild /app/bullet/web/static/app.css /app/bullet/web/static/
+WORKDIR /app/bullet
 
-COPY ./bullet .
-COPY ./CHANGELOG.md .
-COPY --from=cssbuild /app/bullet/web/static/app.css ./web/static/app.css
+RUN SECRET_KEY=none python manage.py collectstatic --no-input
 
-ENV WEB_CONCURRENCY=4
-RUN DATABASE_URL=sqlite://:memory: python manage.py collectstatic --no-input
-CMD ["/app/entrypoint.sh"]
+ENV BASE_START=/app/start.sh

Pipfile

@@ -1,4 +1,3 @@
-version: "3.4"
 services:
   db:
     image: postgres:14-alpine
@@ -10,8 +9,6 @@ services:
       - POSTGRES_DB=bullet
     volumes:
       - postgres_data:/var/lib/postgresql/data/
-    ports:
-      - "5433:5432"
 
   web:
     build:
@@ -28,14 +25,14 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - ./bullet/:/app/
+      - ./bullet/:/app/bullet/
       - geiop_data:/geoip/
       - ./CHANGELOG.md:/app/CHANGELOG.md:ro
     depends_on:
       - db
       - geoip
       - meilisearch
-    command: "./entrypoint.sh dev"
+    command: "/app/start.sh dev"
 
   tailwind:
     build:
@@ -44,8 +41,8 @@ services:
     volumes:
       - ./bullet/:/app/bullet/
       - ./css:/app/css/
-      - ./tailwind.config.js:/app/tailwind.config.js
       - ./package.json:/app/package.json
+      - ./pnpm-lock.yaml:/app/pnpm-lock.yaml
     tty: true
 
   geoip:

Pipfile.lock

@@ -1,6 +1,20 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+
+@theme {
+  --font-family-sans: ["Work Sans", "sans-serif"];
+  
+  --aspect-ratio-4/3: 4 / 3;
+  
+  --grid-template-columns-registration: min-content 3fr 2fr;
+  --grid-template-columns-contestants-edit: min-content 3fr 2fr min-content;
+  
+  --color-primary: var(--primary);
+  --color-primary-light: var(--primary-light);
+  --color-primary-lighter: var(--gradient-dark);
+  --color-primary-dark: var(--primary-dark);
+  
+  --typography-max-width: 75ch;
+}
 
 .branch-math {
     --primary: #27C349;
@@ -84,7 +98,7 @@
 }
 
 .cb-edit {
-    @apply bg-yellow-400 bg-opacity-50 hover:bg-opacity-100 transition-colors;
+    @apply bg-yellow-400/50 hover:bg-yellow-400 transition-colors;
 }
 
 .bold-primary b, .bold-primary strong {