new use_uv

Author: bendog

README.md

@@ -158,4 +158,4 @@ You can run `npm install` and `uv sync` in the respective `client` and `server`
 
 ### Changing env vars
 
-Edit the `.env` file in the respective directory (client or server).
+Edit the `.env` file in the respective directory (client or server).

client/eslint.config.mjs

@@ -6,7 +6,7 @@ import tsParser from "@typescript-eslint/parser";
 const compat = new FlatCompat({
   baseDirectory: import.meta.dirname,
 })
- 
+
 const eslintConfig = [
   ...compat.config({
     extends:  ["next/core-web-vitals", "next/typescript"]
@@ -32,5 +32,5 @@ const eslintConfig = [
     ignores: ["node_modules/**", ".next/**", "next-env.d.ts"]
   }
 ]
- 
-export default eslintConfig
+
+export default eslintConfig

client/next.config.mjs

@@ -1,23 +1,22 @@
-// import os from "node:os";
-// import isInsideContainer from "is-inside-container";
+import os from "node:os";
+import isInsideContainer from "is-inside-container";
 
-// const isWindowsDevContainer = () =>
-//   os.release().toLowerCase().includes("microsoft") && isInsideContainer();
+const isWindowsDevContainer = () =>
+  os.release().toLowerCase().includes("microsoft") && isInsideContainer();
 
 /** @type {import('next').NextConfig} */
-
-const config = {
+const nextConfig = {
   reactStrictMode: true,
-  turbopack: {
-    root: import.meta.dirname,
-  }
-  // Turns on file change polling for the Windows Dev Container
-  // Doesn't work currently for turbopack, so file changes will not automatically update the client.
-    // watchOptions: isWindowsDevContainer()
-    // ? {
-    //     pollIntervalMs: 1000
-    //   }
-    // : undefined,
+  // dumb fix for windows docker
+  webpack: isWindowsDevContainer()
+    ? (config) => {
+        config.watchOptions = {
+          poll: 1000,
+          aggregateTimeout: 300,
+        };
+        return config;
+      }
+    : undefined,
 };
 
-export default config;
+export default nextConfig;

docker-compose.prod.yml

@@ -1,4 +1,16 @@
 services:
+  db:
+    image: postgres:16.4
+    restart: unless-stopped
+    volumes:
+      - ./data/db:/var/lib/postgresql/data
+    env_file: ./.env.prod
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+
   server:
     image: ghcr.io/codersforcauses/django-nextjs-template-use_uv-prod-server:latest
     container_name: transplant_server
@@ -12,6 +24,8 @@ services:
       - ./opt/static_files:/opt/static_files
     environment:
       - DJANGO_SETTINGS_MODULE=api.settings
+    depends_on:
+      - db
 
   client:
     image: ghcr.io/codersforcauses/django-nextjs-template-use_uv-prod-client:latest

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  db:
+    image: postgres:16.4
+    restart: unless-stopped
+    volumes:
+      - ./data/db:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 3s
+      timeout: 3s
+      retries: 5
+    env_file: ./server/.env
+    ports:
+      - 5432:5432

docker/server/Dockerfile

@@ -1,18 +1,16 @@
-FROM python:3.12-slim
+FROM astral/uv:0.9-python3.14-bookworm-slim
 
-RUN apt-get update && apt-get install --yes --no-install-recommends g++ libssl-dev && rm -rf /var/lib/apt/lists/*
-
-RUN pip install --upgrade pip && pip install uv
+RUN apt-get update && apt-get upgrade --yes  && apt-get install --yes --no-install-recommends postgresql-client g++ libssl-dev && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
 COPY ./docker/server/entrypoint.sh /entrypoint.sh
 
 COPY ./server/pyproject.toml ./server/uv.lock ./
 
-RUN uv sync
+RUN uv sync --frozen
 
 COPY ./server ./
 
 RUN chmod +x /entrypoint.sh
-CMD ["/entrypoint.sh"]
+CMD ["/entrypoint.sh"]

docker/server/entrypoint.sh

@@ -1,25 +1,36 @@
 #!/bin/bash
 
+# Wait until Database is available before continuing
+printf "\n" && echo "Checking Database is up"
+# using psql
+while ! pg_isready -q -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER
+do
+  echo "$(date) - waiting for database to start"
+  sleep 1
+done
+
+>&2 echo "Postgres is up - continuing"
+
 echo "Applying database migrations"
-python manage.py migrate --noinput
+uv run python manage.py migrate --noinput
 
 echo "Collecting static files"
-python manage.py collectstatic --noinput
+uv run python manage.py collectstatic --noinput
 
 # Create Django Superuser
 echo "Creating Django Superuser"
-python manage.py createsuperuser --noinput
+uv run python manage.py createsuperuser --noinput
 
 # Run inbuilt Django server if ENV is development
 if [ "${APP_ENV^^}" = "DEVELOPMENT" ]; then
 
     # Install extra non-prod packages
     printf "\n" && echo "Installing dev dependencies for $APP_ENV"
-    uv sync 
+    uv sync --frozen --all-groups
     # Run developments
     printf "\n" && echo "Starting inbuilt django webserver"
     echo "Running: python manage.py runserver 0.0.0.0:8081"
-    python manage.py runserver 0.0.0.0:8081
+    uv run python manage.py runserver 0.0.0.0:8081
     exit
 fi
 
@@ -30,6 +41,6 @@ if [ "${APP_ENV^^}" = "PRODUCTION" ]; then
 
     # Run Gunicorn / Django
     printf "\n" && echo " Running Gunicorn / Django"
-    echo "Running: gunicorn api.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50"
-    gunicorn api.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50
-fi
+    echo "Running: gunicorn server.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50"
+    uv run gunicorn server.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50
+fi

server/.env.example

@@ -4,6 +4,12 @@ APP_ENV=DEVELOPMENT
 API_SECRET_KEY="supersecretkey"
 API_ALLOWED_HOSTS=".localhost 127.0.0.1 [::1]"
 
+POSTGRES_HOST=localhost
+POSTGRES_NAME=postgres
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=password
+POSTGRES_PORT=5432
+
 DJANGO_SUPERUSER_PASSWORD=Password123
 DJANGO_SUPERUSER_EMAIL=admin@test.com
 DJANGO_SUPERUSER_USERNAME=admin

server/.flake8

@@ -0,0 +1 @@
+3.14