lukas
360e8f9eaf
Reviewed-on: #95 12 files changed (+149, -66) Key changes: 1. Monolithic container — Replaced the two-service compose setup (backend + frontend/caddy) with a single timetracker container. Caddy is now built into the image rather than running as a separate container. 2. Supervisord process manager — Added supervisor.conf and installed supervisor in the Dockerfile. entrypoint.sh now delegates to supervisord to manage three processes: Caddy, Gunicorn, and Qcluster — replacing manual trap/signaling logic. 3. Bundled Caddy — The Dockerfile now downloads and installs Caddy v2.9.1 directly into the image (/usr/local/bin/caddy). The Caddyfile was updated to use reverse_proxy localhost:8001 and serves static files from /home/timetracker/app/static. 4. Configurable deployment — Added .env.example with configurable environment variables: TZ, PUID/PGID, TIMETRACKER_EXTERNAL_PORT, DATA_DIR, CSRF_TRUSTED_ORIGINS. docker-compose.yml now references these with sensible defaults. 5. UID/GID flexibility — entrypoint.sh uses usermod/groupmod at startup to remap the timetracker user to the host-specified PUID/PGID, avoiding permission issues with mounted volumes. 6. Database & static files — settings.py now respects DATA_DIR env var for the SQLite database path. STATIC_ROOT changed to BASE_DIR / "static". 7. Dev improvements — New Caddyfile.dev (with browse enabled for static files) and updated Makefile dev-prod target runs Caddy alongside Django in development. 8. Tests — Re-enabled the test step in the Docker build GitHub Actions workflow.
56 lines
1.7 KiB
Docker
56 lines
1.7 KiB
Docker
FROM ghcr.io/astral-sh/uv:python3.14-bookworm-slim AS builder
|
|
|
|
ENV UV_LINK_MODE=copy \
|
|
UV_COMPILE_BYTECODE=1 \
|
|
PYTHONUNBUFFERED=1
|
|
|
|
WORKDIR /home/timetracker/app
|
|
|
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
|
--mount=type=bind,source=uv.lock,target=uv.lock \
|
|
--mount=type=bind,source=pyproject.toml,target=pyproject.toml \
|
|
uv sync --frozen --no-install-project --no-dev
|
|
|
|
COPY . .
|
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
|
uv sync --frozen --no-dev
|
|
|
|
|
|
FROM python:3.14-slim-bookworm
|
|
|
|
ENV PROD=1 \
|
|
PYTHONUNBUFFERED=1 \
|
|
PATH="/home/timetracker/app/.venv/bin:$PATH"
|
|
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
curl \
|
|
ca-certificates \
|
|
libcap2-bin \
|
|
supervisor \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& useradd -m --uid 1000 timetracker \
|
|
&& mkdir -p /var/log/supervisor /etc/supervisor/conf.d /home/timetracker/data \
|
|
&& chown timetracker:timetracker /var/log/supervisor /home/timetracker/data
|
|
|
|
ARG CADDY_VERSION=2.9.1
|
|
RUN curl -sL "https://github.com/caddyserver/caddy/releases/download/v${CADDY_VERSION}/caddy_${CADDY_VERSION}_linux_amd64.tar.gz" \
|
|
-o /tmp/caddy.tar.gz && \
|
|
tar -xzf /tmp/caddy.tar.gz -C /tmp && \
|
|
mv /tmp/caddy /usr/local/bin/caddy && \
|
|
rm /tmp/caddy.tar.gz && \
|
|
chmod +x /usr/local/bin/caddy
|
|
|
|
WORKDIR /home/timetracker/app
|
|
|
|
COPY --from=builder --chown=timetracker:timetracker /home/timetracker/app /home/timetracker/app
|
|
|
|
COPY --chown=timetracker:timetracker Caddyfile /etc/caddy/Caddyfile
|
|
COPY --chown=timetracker:timetracker supervisor.conf /etc/supervisor/conf.d/supervisor.conf
|
|
COPY --chown=timetracker:timetracker entrypoint.sh /
|
|
RUN chmod +x /entrypoint.sh
|
|
|
|
ENV VERSION_NUMBER=1.6.1
|
|
|
|
EXPOSE 8000
|
|
ENTRYPOINT ["/entrypoint.sh"]
|