WIP

Author: Themitchell

Dockerfile.chainguard

@@ -0,0 +1,54 @@
+FROM cgr.dev/nhs.net/node:25.2-dev AS asset_builder
+
+USER root
+WORKDIR /app
+
+COPY package.json package-lock.json rollup.config.js  ./
+COPY . .
+RUN npm ci
+RUN npm run compile
+
+
+FROM cgr.dev/nhs.net/python:3.14-dev AS python_base
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    VIRTUAL_ENV=/app/.venv \
+    PATH="/app/.venv/bin:$PATH" \
+    USER=app
+
+USER root
+RUN addgroup --gid 1000 --system ${USER} \
+    && adduser --uid 1000 --system ${USER} --ingroup ${USER}
+
+
+FROM python_base AS builder
+
+USER root
+WORKDIR /app
+
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    POETRY_CACHE_DIR=/tmp/poetry_cache
+
+COPY pyproject.toml poetry.lock ./
+RUN pip install poetry
+RUN poetry install --without dev --no-root && rm -rf $POETRY_CACHE_DIR
+
+
+FROM python_base
+
+USER ${USER}
+WORKDIR /app
+
+COPY --from=builder --chown=${USER}:${USER} ${VIRTUAL_ENV} ${VIRTUAL_ENV}
+COPY --chown=${USER}:${USER} ./lung_cancer_screening /app/lung_cancer_screening
+COPY --from=asset_builder --chown=${USER}:${USER} /app/lung_cancer_screening/assets/compiled /app/lung_cancer_screening/assets/compiled
+COPY --chown=${USER}:${USER} manage.py ./
+
+RUN python ./manage.py collectstatic --noinput
+
+EXPOSE 8000
+
+ENTRYPOINT ["/app/.venv/bin/gunicorn", "--bind", "0.0.0.0:8000", "lung_cancer_screening.wsgi"]

Dockerfile.dev

@@ -1,5 +1,5 @@
 # Alpine doesn't support playwright
-FROM python:3.14.1-slim AS development
+FROM python:3.14.1-slim
 
 ARG UID=1000
 ENV USER=app
@@ -55,3 +55,5 @@ RUN poetry run playwright install --with-deps chromium
 
 USER ${USER}
 COPY --chown=${USER}:${USER} . .
+
+CMD ["/usr/bin/python", "manage.py", "runserver", "0.0.0.0:8000"]

docker-compose.yml

@@ -4,20 +4,18 @@ services:
   web:
     build:
       context: .
-      dockerfile: Dockerfile.dev
-      target: development
-    command: python manage.py runserver 0.0.0.0:8000
+      dockerfile: Dockerfile.chainguard
     ports:
       - "8000:8000"
     env_file:
       - .env
     depends_on:
       - db
       - asset_builder
-    volumes:
-      - ./:/app
-      - venv:/app/.venv
-      - playwright_browsers:/app/browsers
+    # volumes:
+      # - ./:/app
+      # - venv:/app/.venv
+      # - playwright_browsers:/app/browsers
     restart: unless-stopped
 
   asset_builder:

makefiles/dev.mk

@@ -19,10 +19,10 @@ dev-logs:
 	$(DOCKER_COMPOSE_CMD) logs -f
 
 dev-shell:
-	$(DOCKER_COMPOSE_CMD) run --rm web bash
+	$(DOCKER_COMPOSE_CMD) run --rm --entrypoint /bin/sh web
 
 dev-migrate:
-	$(DOCKER_COMPOSE_CMD) run --rm web python manage.py migrate
+	$(DOCKER_COMPOSE_CMD) run --rm --entrypoint /usr/bin/python web manage.py migrate
 
 dev-makemigrations:
 	$(DOCKER_COMPOSE_CMD) run --rm web python manage.py makemigrations