From d8cd7cc571d1c5c9af28d50d92272c9b8eb654bf Mon Sep 17 00:00:00 2001
From: ThePhaseless <kukubaorch@gmail.com>
Date: Thu, 16 Oct 2025 09:36:09 +0000
Subject: [PATCH] remake dockerfile

---
 Dockerfile | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index afcc8cc..4c25e9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,14 @@
-FROM debian:stable-slim AS base
+# Ubuntu is required by playwright
+FROM ubuntu:latest AS base
 
 ARG GITHUB_BUILD=false \
-    VERSION
+    UV_CACHE_DIR=/var/cache/uv \
+    VERSION \
+    USER=ubuntu \
+    UID=1000
+
+ARG GROUP=${USER} \
+    GID=${UID}
 
 ENV GITHUB_BUILD=${GITHUB_BUILD}\
     VERSION=${VERSION}\
@@ -10,36 +17,41 @@ ENV GITHUB_BUILD=${GITHUB_BUILD}\
     # prevents python creating .pyc files
     PYTHONDONTWRITEBYTECODE=1 \
     UV_LINK_MODE=copy \
-    UV_CACHE_DIR=/var/cache/uv
-
-WORKDIR /app
-
-RUN apt update && apt -y upgrade && apt install -y curl
-
-# Create non-root user
-RUN groupadd -r appuser && useradd -r -g appuser -u 1000 appuser
+    UV_CACHE_DIR=${UV_CACHE_DIR}
 
+RUN apt update &&\
+    apt -y upgrade &&\
+    apt install -y curl
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-RUN uvx playwright install-deps firefox && uvx camoufox fetch
 
 FROM base AS devcontainer
-RUN apt install -y git
+RUN apt install -y git &&\
+    uvx playwright install-deps firefox &&\
+    uvx camoufox fetch
 ENTRYPOINT [ "sleep", "infinity" ]
 
-
 FROM base AS app
+WORKDIR /app
+RUN chown ${USER}:${GROUP} /app &&\
+    mkdir -p ${UV_CACHE_DIR} &&\
+    chown ${USER}:${GROUP} ${UV_CACHE_DIR}
+
+USER ${USER}
 COPY pyproject.toml uv.lock ./
-RUN --mount=type=cache,target=/var/cache/uv uv sync
+RUN uv sync && uv run camoufox fetch
+
+USER root
+RUN uv run playwright install-deps firefox
+USER ${USER}
 
 COPY . .
-RUN chown -R appuser:appuser /app
 
 FROM app AS test
-RUN --mount=type=cache,target=/var/cache/uv uv sync --group test
-RUN uv run pytest --retries 3
+RUN \
+    uv sync --group test &&\
+    uv run pytest --retries 3
 
 FROM app
-USER appuser
 EXPOSE 8191
 HEALTHCHECK --interval=15m --timeout=30s --start-period=5s --retries=3 CMD [ "curl", "http://localhost:8191/health" ]
 ENTRYPOINT ["uv", "run", "main.py"]