Compare commits
3 Commits
feat/ai-ba
...
feat/add-d
| Author | SHA1 | Date | |
|---|---|---|---|
| 29ac1e0d25 | |||
| ede5ec499f | |||
|
|
ccdb1c0931 |
@@ -1,23 +1,66 @@
|
|||||||
|
FROM ghcr.io/astral-sh/uv:0.11.6-python3.13-trixie@sha256:b3c543b6c4f23a5f2df22866bd7857e5d304b67a564f4feab6ac22044dde719b AS uv_source
|
||||||
|
FROM tianon/gosu:1.19-trixie@sha256:3b176695959c71e123eb390d427efc665eeb561b1540e82679c15e992006b8b9 AS gosu_source
|
||||||
FROM debian:13.4
|
FROM debian:13.4
|
||||||
|
|
||||||
# Install uv (Python package manager), curl, poppler-utils, and imagemagick
|
# Disable Python stdout buffering to ensure logs are printed immediately
|
||||||
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
|
# Store Playwright browsers outside the volume mount so the build-time
|
||||||
|
# install survives the /opt/data volume overlay at runtime.
|
||||||
|
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
|
||||||
|
|
||||||
|
# Install system dependencies in one layer, clear APT cache
|
||||||
|
# tini reaps orphaned zombie processes (MCP stdio subprocesses, git, bun, etc.)
|
||||||
|
# that would otherwise accumulate when hermes runs as PID 1. See #15012.
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
curl \
|
build-essential nodejs npm python3 ripgrep ffmpeg gcc python3-dev libffi-dev procps git openssh-client docker-cli tini \
|
||||||
poppler-utils \
|
curl poppler-utils imagemagick \
|
||||||
imagemagick && \
|
chromium xvfb fonts-noto-color-emoji fonts-unifont fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf \
|
||||||
|
libasound2t64 libatk-bridge2.0-0t64 libatk1.0-0t64 libatspi2.0-0t64 libcairo2 libcups2t64 libdbus-1-3 libdrm2 libgbm1 libglib2.0-0t64 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install uv if not already present (debian:13.4 doesn't ship it)
|
# Non-root user for runtime; UID can be overridden via HERMES_UID at runtime
|
||||||
COPY --from=ghcr.io/astral-sh/uv:latest /usr/local/bin/uv /usr/local/bin/uv
|
RUN useradd -u 10000 -m -d /opt/data hermes
|
||||||
RUN uv --version
|
|
||||||
|
|
||||||
# Verify all expected tools are available
|
COPY --chmod=0755 --from=gosu_source /gosu /usr/local/bin/
|
||||||
RUN curl --version && \
|
COPY --chmod=0755 --from=uv_source /usr/local/bin/uv /usr/local/bin/uvx /usr/local/bin/
|
||||||
pdftotext -v 2>&1 | head -1 && \
|
|
||||||
pdfinfo -v 2>&1 | head -1 && \
|
|
||||||
pdftoppm -v 2>&1 | head -1 && \
|
|
||||||
convert --version | head -1 && \
|
|
||||||
identify --version | head -1
|
|
||||||
|
|
||||||
CMD ["/bin/bash"]
|
WORKDIR /opt/hermes
|
||||||
|
|
||||||
|
# ---------- Layer-cached dependency install ----------
|
||||||
|
# Copy only package manifests first so npm install + Playwright are cached
|
||||||
|
# unless the lockfiles themselves change.
|
||||||
|
COPY package.json package-lock.json ./
|
||||||
|
COPY web/package.json web/package-lock.json web/
|
||||||
|
|
||||||
|
RUN npm install --prefer-offline --no-audit && \
|
||||||
|
npx playwright install --with-deps chromium --only-shell && \
|
||||||
|
(cd web && npm install --prefer-offline --no-audit) && \
|
||||||
|
npm cache clean --force
|
||||||
|
|
||||||
|
# ---------- Source code ----------
|
||||||
|
# .dockerignore excludes node_modules, so the installs above survive.
|
||||||
|
COPY --chown=hermes:hermes . .
|
||||||
|
|
||||||
|
# Build web dashboard (Vite outputs to hermes_cli/web_dist/)
|
||||||
|
RUN cd web && npm run build
|
||||||
|
|
||||||
|
# ---------- Permissions ----------
|
||||||
|
# Make install dir world-readable so any HERMES_UID can read it at runtime.
|
||||||
|
# The venv needs to be traversable too.
|
||||||
|
USER root
|
||||||
|
RUN chmod -R a+rX /opt/hermes
|
||||||
|
# Start as root so the entrypoint can usermod/groupmod + gosu.
|
||||||
|
# If HERMES_UID is unset, the entrypoint drops to the default hermes user (10000).
|
||||||
|
|
||||||
|
# ---------- Python virtualenv ----------
|
||||||
|
RUN uv venv && \
|
||||||
|
uv pip install --no-cache-dir -e ".[all]"
|
||||||
|
|
||||||
|
# ---------- Runtime ----------
|
||||||
|
ENV HERMES_WEB_DIST=/opt/hermes/hermes_cli/web_dist
|
||||||
|
ENV HERMES_HOME=/opt/data
|
||||||
|
ENV PATH="/opt/data/.local/bin:${PATH}"
|
||||||
|
VOLUME [ "/opt/data" ]
|
||||||
|
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/docker/entrypoint.sh" ]
|
||||||
|
|||||||
@@ -129,22 +129,6 @@ services:
|
|||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
|
|
||||||
paperclip-db:
|
|
||||||
image: postgres:17
|
|
||||||
container_name: paperclip-db
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
- POSTGRES_PASSWORD=${PAPERCLIP_DB_PASSWORD}
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/db:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
14
dashi/compose.yml
Normal file
14
dashi/compose.yml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
services:
|
||||||
|
dashi:
|
||||||
|
image: jamjnsn/dashi:latest
|
||||||
|
container_name: dashi
|
||||||
|
expose:
|
||||||
|
- "8000"
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- dashi_net
|
||||||
|
|
||||||
|
networks:
|
||||||
|
dashi_net:
|
||||||
|
driver: bridge
|
||||||
|
name: dashi_net
|
||||||
@@ -41,6 +41,7 @@ services:
|
|||||||
- passman_net
|
- passman_net
|
||||||
- tak_net
|
- tak_net
|
||||||
- vc_net
|
- vc_net
|
||||||
|
- dashi_net
|
||||||
|
|
||||||
ddns-updater:
|
ddns-updater:
|
||||||
image: qmcgaw/ddns-updater
|
image: qmcgaw/ddns-updater
|
||||||
@@ -114,6 +115,9 @@ networks:
|
|||||||
vc_net:
|
vc_net:
|
||||||
external: true
|
external: true
|
||||||
name: vc_net
|
name: vc_net
|
||||||
|
dashi_net:
|
||||||
|
external: true
|
||||||
|
name: dashi_net
|
||||||
|
|
||||||
# duckdns:
|
# duckdns:
|
||||||
# environment:
|
# environment:
|
||||||
|
|||||||
Reference in New Issue
Block a user