mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-01 07:01:41 +00:00
48083211ef
Salvages #25872 by @konsisumer against current main. NAS users (UGOS, Synology, unRAID) expect the LinuxServer.io PUID/PGID convention and bind-mount /opt/data from a host directory owned by their own UID. Without this alias those vars are silently ignored and the s6-setuidgid drop to UID 10000 leaves the runtime unable to read the volume. HERMES_UID/HERMES_GID still take precedence when both are set. The original PR targeted docker/entrypoint.sh, which is now a 27-line deprecation shim under s6-overlay (the May 2026 rework moved all bootstrap logic to docker/stage2-hook.sh, installed as /etc/cont-init.d/01-hermes-setup). Re-applied the same 2-line alias resolution at the equivalent spot in stage2-hook.sh just before the existing UID/GID remap block. Test was retargeted at docker/stage2-hook.sh; docs hunk adapted to current main's wording ("stage2 hook" + s6-setuidgid, not the obsolete "entrypoint drops via gosu") with the NAS bind-mount example preserved verbatim. Test-first regression verification: reverted just docker/stage2-hook.sh to origin/main and re-ran the new tests. Result: FAILED test_stage2_hook_resolves_puid_pgid_aliases FAILED test_puid_pgid_populate_hermes_uid_gid AssertionError: assert ':' == '1000:10' That's the exact bug shape — PUID=1000 PGID=10 silently ignored, HERMES_UID/HERMES_GID stay empty. With the salvage applied, all 4 tests pass. Closes #25872 Co-authored-by: konsisumer <11262660+konsisumer@users.noreply.github.com>
243 lines
12 KiB
Bash
Executable file
243 lines
12 KiB
Bash
Executable file
#!/bin/sh
|
|
# s6-overlay stage2 hook — runs as root after the supervision tree is
|
|
# up but before user services start. Handles UID/GID remap, volume
|
|
# chown, config seeding, and skills sync.
|
|
#
|
|
# Per-service privilege drop happens inside each service's `run` script
|
|
# (and in main-wrapper.sh) via s6-setuidgid, not here.
|
|
#
|
|
# Wired into the image as /etc/cont-init.d/01-hermes-setup by the
|
|
# Dockerfile. The shim at docker/entrypoint.sh forwards to this script
|
|
# so external references to docker/entrypoint.sh still work.
|
|
#
|
|
# NB: cont-init.d scripts run with no arguments — the user's CMD args
|
|
# are NOT visible here. That's fine: we use Architecture B (s6-overlay
|
|
# main-program model), so main-wrapper.sh runs the CMD with full
|
|
# stdin/stdout/stderr access and handles arg parsing there.
|
|
|
|
set -eu
|
|
|
|
HERMES_HOME="${HERMES_HOME:-/opt/data}"
|
|
INSTALL_DIR="/opt/hermes"
|
|
|
|
# --- Bootstrap HERMES_HOME as root ---
|
|
# Create the directory (and any missing parents) while we still have root
|
|
# privileges so the chown checks below see real metadata and the later
|
|
# `s6-setuidgid hermes mkdir -p` block doesn't EACCES on root-owned
|
|
# ancestors. Without this, custom HERMES_HOME paths whose parents only
|
|
# root can create (e.g. `HERMES_HOME=/home/hermes/.hermes` in a Compose
|
|
# file, or any path under a fresh / not pre-populated by the image)
|
|
# fail on first boot with `mkdir: cannot create directory '/...': Permission
|
|
# denied` and the cont-init hook exits non-zero. Idempotent — `mkdir -p`
|
|
# is a no-op if the dir already exists. (#18482, salvages #18488)
|
|
mkdir -p "$HERMES_HOME"
|
|
|
|
# --- UID/GID remap ---
|
|
# Accept PUID/PGID as aliases for HERMES_UID/HERMES_GID. NAS users (UGOS,
|
|
# Synology, unRAID) expect the LinuxServer.io PUID/PGID convention and
|
|
# bind-mount /opt/data from a host directory owned by their own UID; without
|
|
# this alias those vars are silently ignored and the s6-setuidgid drop to
|
|
# UID 10000 leaves the runtime unable to read the volume. HERMES_UID/
|
|
# HERMES_GID still win when both are set. See #15290, salvages #25872.
|
|
HERMES_UID="${HERMES_UID:-${PUID:-}}"
|
|
HERMES_GID="${HERMES_GID:-${PGID:-}}"
|
|
|
|
if [ -n "${HERMES_UID:-}" ] && [ "$HERMES_UID" != "$(id -u hermes)" ]; then
|
|
echo "[stage2] Changing hermes UID to $HERMES_UID"
|
|
usermod -u "$HERMES_UID" hermes
|
|
fi
|
|
if [ -n "${HERMES_GID:-}" ] && [ "$HERMES_GID" != "$(id -g hermes)" ]; then
|
|
echo "[stage2] Changing hermes GID to $HERMES_GID"
|
|
# -o allows non-unique GID (e.g. macOS GID 20 "staff" may already
|
|
# exist as "dialout" in the Debian-based container image).
|
|
groupmod -o -g "$HERMES_GID" hermes 2>/dev/null || true
|
|
fi
|
|
|
|
# --- Fix ownership of data volume ---
|
|
# When HERMES_UID is remapped or the top-level $HERMES_HOME isn't owned by
|
|
# the runtime hermes UID, restore ownership to hermes — but ONLY for the
|
|
# directories hermes actually writes to. The full $HERMES_HOME may be a
|
|
# host-mounted bind containing unrelated user files; `chown -R` would
|
|
# silently destroy host ownership of those (see issue #19788).
|
|
#
|
|
# The canonical list of hermes-owned subdirs is the same one the s6-setuidgid
|
|
# mkdir -p block below seeds. Keep them in sync if the seed list changes.
|
|
actual_hermes_uid=$(id -u hermes)
|
|
needs_chown=false
|
|
if [ -n "${HERMES_UID:-}" ] && [ "$HERMES_UID" != "10000" ]; then
|
|
needs_chown=true
|
|
elif [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$actual_hermes_uid" ]; then
|
|
needs_chown=true
|
|
fi
|
|
if [ "$needs_chown" = true ]; then
|
|
echo "[stage2] Fixing ownership of $HERMES_HOME (targeted) to hermes ($actual_hermes_uid)"
|
|
# In rootless Podman the container's "root" is mapped to an
|
|
# unprivileged host UID — chown will fail. That's fine: the volume
|
|
# is already owned by the mapped user on the host side.
|
|
#
|
|
# Top-level $HERMES_HOME: chown the directory itself (not its contents)
|
|
# so hermes can mkdir new subdirs but bind-mounted host files keep
|
|
# their existing ownership.
|
|
chown hermes:hermes "$HERMES_HOME" 2>/dev/null || \
|
|
echo "[stage2] Warning: chown $HERMES_HOME failed (rootless container?) — continuing"
|
|
# Hermes-owned subdirs: recursive chown is safe here because these are
|
|
# created and managed exclusively by hermes (see the s6-setuidgid mkdir
|
|
# -p block below for the canonical list).
|
|
for sub in cron sessions logs hooks memories skills skins plans workspace home profiles; do
|
|
if [ -e "$HERMES_HOME/$sub" ]; then
|
|
chown -R hermes:hermes "$HERMES_HOME/$sub" 2>/dev/null || \
|
|
echo "[stage2] Warning: chown $HERMES_HOME/$sub failed (rootless container?) — continuing"
|
|
fi
|
|
done
|
|
# Hermes-owned trees under $INSTALL_DIR must be re-chowned when the UID
|
|
# is remapped — otherwise:
|
|
# - .venv: lazy_deps.py cannot install platform packages (discord.py,
|
|
# telegram, slack, etc.) with EACCES (#15012, #21100)
|
|
# - ui-tui: esbuild rebuilds dist/entry.js on every TUI launch (when
|
|
# the source mtime is newer than dist/ or when HERMES_TUI_FORCE_BUILD
|
|
# is set) and writes to ui-tui/dist/. Without this chown the new
|
|
# hermes UID can't write the build output (#28851).
|
|
# - node_modules: root-level dependencies (puppeteer, web tooling)
|
|
# that runtime code may walk/update.
|
|
# The set mirrors the build-time `chown -R hermes:hermes` line in the
|
|
# Dockerfile — keep them in sync if the Dockerfile chown set changes.
|
|
# These are under $INSTALL_DIR (not $HERMES_HOME), so the bind-mount
|
|
# concern doesn't apply — recursive is fine.
|
|
chown -R hermes:hermes \
|
|
"$INSTALL_DIR/.venv" \
|
|
"$INSTALL_DIR/ui-tui" \
|
|
"$INSTALL_DIR/node_modules" \
|
|
2>/dev/null || \
|
|
echo "[stage2] Warning: chown of build trees failed (rootless container?) — continuing"
|
|
fi
|
|
|
|
# Always reset ownership of $HERMES_HOME/profiles to hermes on every
|
|
# boot. Profile dirs and files can land owned by root when commands
|
|
# are invoked via `docker exec <container> hermes …` (which defaults
|
|
# to root unless `-u` is passed), and that breaks the cont-init
|
|
# reconciler (02-reconcile-profiles) which runs as hermes and walks
|
|
# the profiles dir. Idempotent; skipped on rootless containers where
|
|
# chown would fail.
|
|
if [ -d "$HERMES_HOME/profiles" ]; then
|
|
chown -R hermes:hermes "$HERMES_HOME/profiles" 2>/dev/null || true
|
|
fi
|
|
|
|
# --- config.yaml permissions ---
|
|
# Ensure config.yaml is readable by the hermes runtime user even if it
|
|
# was edited on the host after initial ownership setup.
|
|
if [ -f "$HERMES_HOME/config.yaml" ]; then
|
|
chown hermes:hermes "$HERMES_HOME/config.yaml" 2>/dev/null || true
|
|
chmod 640 "$HERMES_HOME/config.yaml" 2>/dev/null || true
|
|
fi
|
|
|
|
# --- Seed directory structure as hermes user ---
|
|
# Run as hermes via s6-setuidgid so dirs end up owned correctly (matters
|
|
# under rootless Podman where chown back to root would fail).
|
|
#
|
|
# Use direct `mkdir -p` invocation (no `sh -c "..."` wrapper) so the
|
|
# shell isn't a second interpreter — defends against $HERMES_HOME values
|
|
# containing shell metacharacters. PR #30136 review item O2.
|
|
s6-setuidgid hermes mkdir -p \
|
|
"$HERMES_HOME/cron" \
|
|
"$HERMES_HOME/sessions" \
|
|
"$HERMES_HOME/logs" \
|
|
"$HERMES_HOME/hooks" \
|
|
"$HERMES_HOME/memories" \
|
|
"$HERMES_HOME/skills" \
|
|
"$HERMES_HOME/skins" \
|
|
"$HERMES_HOME/plans" \
|
|
"$HERMES_HOME/workspace" \
|
|
"$HERMES_HOME/home"
|
|
|
|
# --- Install-method stamp (read by detect_install_method() in hermes status) ---
|
|
# Preserved from the tini-era entrypoint (PR #27843). Must be written as
|
|
# the hermes user so ownership matches the file's documented owner.
|
|
# tee is invoked directly via s6-setuidgid (no `sh -c` wrapper) for the
|
|
# same shell-metacharacter safety described above.
|
|
printf 'docker\n' | s6-setuidgid hermes tee "$HERMES_HOME/.install_method" >/dev/null \
|
|
|| true
|
|
|
|
# --- Seed config files (only on first boot) ---
|
|
seed_one() {
|
|
dest=$1
|
|
src=$2
|
|
if [ ! -f "$HERMES_HOME/$dest" ] && [ -f "$INSTALL_DIR/$src" ]; then
|
|
s6-setuidgid hermes cp "$INSTALL_DIR/$src" "$HERMES_HOME/$dest"
|
|
fi
|
|
}
|
|
seed_one ".env" ".env.example"
|
|
seed_one "config.yaml" "cli-config.yaml.example"
|
|
seed_one "SOUL.md" "docker/SOUL.md"
|
|
|
|
# .env holds API keys and secrets — restrict to owner-only access. Applied
|
|
# unconditionally (not only on first-seed) so a host-mounted .env that was
|
|
# created with a permissive umask gets tightened on every container start.
|
|
if [ -f "$HERMES_HOME/.env" ]; then
|
|
chown hermes:hermes "$HERMES_HOME/.env" 2>/dev/null || true
|
|
chmod 600 "$HERMES_HOME/.env" 2>/dev/null || true
|
|
fi
|
|
|
|
# auth.json: bootstrap from env on first boot only. Same semantics as the
|
|
# pre-s6 entrypoint — the [ ! -f ] guard is critical to avoid clobbering
|
|
# rotated refresh tokens on container restart.
|
|
if [ ! -f "$HERMES_HOME/auth.json" ] && [ -n "${HERMES_AUTH_JSON_BOOTSTRAP:-}" ]; then
|
|
printf '%s' "$HERMES_AUTH_JSON_BOOTSTRAP" > "$HERMES_HOME/auth.json"
|
|
chown hermes:hermes "$HERMES_HOME/auth.json" 2>/dev/null || true
|
|
chmod 600 "$HERMES_HOME/auth.json"
|
|
fi
|
|
|
|
# --- Sync bundled skills ---
|
|
# Invoke the venv's python by absolute path so we don't need a `sh -c`
|
|
# wrapper to source the activate script. This is safe because
|
|
# skills_sync.py doesn't depend on any environment exports beyond what
|
|
# the python binary's own bin-stub already sets up (sys.path is rooted
|
|
# at the venv's site-packages by virtue of running .venv/bin/python).
|
|
if [ -d "$INSTALL_DIR/skills" ]; then
|
|
s6-setuidgid hermes "$INSTALL_DIR/.venv/bin/python" "$INSTALL_DIR/tools/skills_sync.py" \
|
|
|| echo "[stage2] Warning: skills_sync.py failed; continuing"
|
|
fi
|
|
|
|
# --- Discover agent-browser's Chromium binary ---
|
|
# The image's Dockerfile runs `npx playwright install chromium`, which
|
|
# populates ``$PLAYWRIGHT_BROWSERS_PATH`` (=/opt/hermes/.playwright) with
|
|
# a ``chromium_headless_shell-<build>/chrome-headless-shell-linux64/``
|
|
# directory. agent-browser (the runtime CLI Hermes spawns for the
|
|
# browser tool) doesn't recognise this layout in its own cache scan and
|
|
# fails with "Auto-launch failed: Chrome not found" — even though the
|
|
# binary is right there (#15697).
|
|
#
|
|
# Fix: locate the binary at boot and export ``AGENT_BROWSER_EXECUTABLE_PATH``
|
|
# via /run/s6/container_environment so the `with-contenv` shebang on
|
|
# main-wrapper.sh propagates it into the supervised ``hermes`` process
|
|
# and thence to agent-browser subprocesses.
|
|
#
|
|
# - Skipped when the user has already set ``AGENT_BROWSER_EXECUTABLE_PATH``
|
|
# (lets users override with a system Chrome install).
|
|
# - Filename-matched (not path-matched): the chromium dir contains many
|
|
# shared libraries (libGLESv2.so, libEGL.so, ...) which inherit the
|
|
# executable bit from Playwright's tarball but are NOT browser binaries.
|
|
# We only accept files whose basename is chrome / chromium /
|
|
# chrome-headless-shell / chromium-browser. Compare PR #18635's earlier
|
|
# ``find | grep -Ei 'chrome|chromium'`` which would match the path
|
|
# ``.../chrome-headless-shell-linux64/libGLESv2.so`` and pick a .so.
|
|
# - Quietly skipped when $PLAYWRIGHT_BROWSERS_PATH doesn't exist (e.g.
|
|
# custom builds that strip Playwright).
|
|
if [ -z "${AGENT_BROWSER_EXECUTABLE_PATH:-}" ] && \
|
|
[ -n "${PLAYWRIGHT_BROWSERS_PATH:-}" ] && \
|
|
[ -d "$PLAYWRIGHT_BROWSERS_PATH" ]; then
|
|
browser_bin=$(find "$PLAYWRIGHT_BROWSERS_PATH" -type f -executable \
|
|
\( -name 'chrome' -o -name 'chromium' \
|
|
-o -name 'chrome-headless-shell' -o -name 'chromium-browser' \) \
|
|
2>/dev/null | head -n 1)
|
|
if [ -n "$browser_bin" ]; then
|
|
echo "[stage2] Found agent-browser Chromium binary: $browser_bin"
|
|
# Write to s6's container_environment so with-contenv picks it
|
|
# up for all supervised services (main-hermes, dashboard, etc.).
|
|
# Idempotent: each boot overwrites with the current path.
|
|
printf '%s' "$browser_bin" > /run/s6/container_environment/AGENT_BROWSER_EXECUTABLE_PATH
|
|
else
|
|
echo "[stage2] Warning: no Chromium binary under $PLAYWRIGHT_BROWSERS_PATH; browser tool may fail"
|
|
fi
|
|
fi
|
|
|
|
echo "[stage2] Setup complete; starting user services"
|