Compare commits
13 Commits
fix/himala
...
b1dbdb9f2d
| Author | SHA1 | Date | |
|---|---|---|---|
| b1dbdb9f2d | |||
| 29ae32a1c5 | |||
| 8dff094768 | |||
| ec08f5eb5d | |||
| 611e96b306 | |||
| f184ed957c | |||
| 2bf31c7ccc | |||
| f44f93e35a | |||
| 4cdd157e3f | |||
| 3ba0345887 | |||
| 5e242eb946 | |||
| e607982b21 | |||
| 4627199217 |
@@ -1,4 +1,35 @@
|
||||
version: "3.8"
|
||||
|
||||
# ── Hermes Worker Template ──────────────────────────────────
|
||||
# Used by paperclip-worker-* Hermes containers via YAML anchor.
|
||||
# Each worker = one isolated Hermes agent for a Paperclip employee.
|
||||
# Override at service level: container_name, API_SERVER_PORT,
|
||||
# API_SERVER_KEY, DISCORD_BOT_TOKEN, volumes.
|
||||
# Workers have NO GPU — they use OpenCode Go or remote providers.
|
||||
x-hermes-worker: &hermes-worker
|
||||
build:
|
||||
context: ./hermes
|
||||
ssh:
|
||||
- default
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"hermes-entrypoint"]
|
||||
command: gateway run
|
||||
restart: always
|
||||
environment:
|
||||
API_SERVER_ENABLED: "true"
|
||||
API_SERVER_HOST: "0.0.0.0"
|
||||
OLLAMA_HOST: "http://ollama:11434"
|
||||
OPENROUTER_API_KEY: ${OPENROUTER_API_KEY}
|
||||
# Each worker needs its own OpenCode Go API key in .env
|
||||
OPENCODE_GO_API_KEY: ${OPENCODE_GO_API_KEY}
|
||||
GATEWAY_ALLOW_ALL_USERS: "true"
|
||||
TZ: "America/Montreal"
|
||||
networks:
|
||||
ai_backend:
|
||||
# NO devices — workers are CPU-only, no GPU passthrough
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
services:
|
||||
|
||||
# webui:
|
||||
@@ -31,6 +62,9 @@ services:
|
||||
ssh:
|
||||
- default
|
||||
container_name: hermes
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"hermes-entrypoint"]
|
||||
restart: always
|
||||
# Gateway run enables the internal API server on port 8642
|
||||
command: gateway run
|
||||
@@ -93,6 +127,24 @@ services:
|
||||
- "303"
|
||||
- "26"
|
||||
|
||||
# ── Paperclip Worker Hermes Agents ──────────────────────────
|
||||
# Each worker is an isolated Hermes agent for a Paperclip employee.
|
||||
# Add new workers with: ./scripts/provision-hermes-worker.sh <name> <discord-token>
|
||||
# The API server key and port are generated automatically.
|
||||
# Workers are CPU-only — they use OpenCode Go or remote providers.
|
||||
|
||||
# ── Worker Template (commented — uncomment + configure to activate) ──
|
||||
# hermes-worker-1:
|
||||
# <<: *hermes-worker
|
||||
# container_name: hermes-worker-1
|
||||
# environment:
|
||||
# API_SERVER_PORT: "8651"
|
||||
# API_SERVER_KEY: "generated-by-provision-script"
|
||||
# DISCORD_BOT_TOKEN: ${WORKER_1_DISCORD_BOT_TOKEN}
|
||||
# volumes:
|
||||
# - /mnt/HoardingCow_docker_data/Hermes/worker-1:/opt/data
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
networks:
|
||||
ai_net:
|
||||
external: true
|
||||
|
||||
@@ -86,7 +86,8 @@ ENV PATH="/opt/data/.local/bin:${PATH}"
|
||||
# Point browser tool to Playwright's Chromium (already in base image)
|
||||
ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
|
||||
|
||||
VOLUME [ "/opt/data" ]
|
||||
# Ensure tools directory and toolsets.py are writable by the hermes runtime user
|
||||
# so custom tools can be injected from the persistent volume at startup.
|
||||
RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
|
||||
|
||||
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
|
||||
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
|
||||
VOLUME [ "/opt/data" ]
|
||||
@@ -1,38 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Startup permission fix + TTS patch.
|
||||
# Runs as root before the entrypoint drops to the hermes user.
|
||||
set -e
|
||||
|
||||
HERMES_HOME="${HERMES_HOME:-/opt/data}"
|
||||
|
||||
# Fix ownership on critical writable directories
|
||||
chown -R hermes:hermes \
|
||||
"$HERMES_HOME/sessions" \
|
||||
"$HERMES_HOME/checkpoints" \
|
||||
"$HERMES_HOME/skills" \
|
||||
"$HERMES_HOME/memories" \
|
||||
"$HERMES_HOME/workspace" \
|
||||
"$HERMES_HOME/pastes" \
|
||||
"$HERMES_HOME/logs" \
|
||||
"$HERMES_HOME/cron" \
|
||||
"$HERMES_HOME/plans" \
|
||||
"$HERMES_HOME/hooks" \
|
||||
"$HERMES_HOME/cache" \
|
||||
2>/dev/null || true
|
||||
|
||||
# Fix data volume root ownership
|
||||
if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
|
||||
chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# ---------- Patch tts_tool.py: replace Edge TTS with Piper ----------
|
||||
# Fallback runtime patch in case the volume's site-packages differ from the image.
|
||||
# Idempotent: if already patched, the script does nothing.
|
||||
PATCH_SCRIPT="/opt/hermes/patch_tts_tool.py"
|
||||
if [ -f "$PATCH_SCRIPT" ]; then
|
||||
echo "Applying TTS patch (Piper only, no Edge fallback)..."
|
||||
/opt/hermes/.venv/bin/python3 "$PATCH_SCRIPT" 2>&1 || true
|
||||
fi
|
||||
|
||||
# Chain to the official Hermes entrypoint
|
||||
exec /opt/hermes/docker/entrypoint.sh "$@"
|
||||
135
ai/scripts/provision-hermes-worker.sh
Executable file
135
ai/scripts/provision-hermes-worker.sh
Executable file
@@ -0,0 +1,135 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# ── Hermes Worker Provisioner ──────────────────────────────
|
||||
# Adds a new Paperclip Hermes worker to the ai compose stack.
|
||||
#
|
||||
# Usage:
|
||||
# ./provision-hermes-worker.sh <name> <discord_bot_token_var>
|
||||
#
|
||||
# Example:
|
||||
# ./provision-hermes-worker.sh worker-1 WORKER_1_DISCORD_BOT_TOKEN
|
||||
#
|
||||
# The script APPENDS only — never modifies or removes existing
|
||||
# content, even commented lines.
|
||||
#
|
||||
# Post-provision steps (manual):
|
||||
# 1. Add secrets to agenix .env file
|
||||
# 2. systemctl restart ai_stack.service
|
||||
# 3. Configure Paperclip agent
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
|
||||
NAME="${1:?Usage: $0 <name> <discord_bot_token_var>}"
|
||||
TOKEN_VAR="${2:?Usage: $0 <name> <discord_bot_token_var>}"
|
||||
|
||||
# ── Paths ───────────────────────────────────────────────────
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
COMPOSE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
COMPOSE_FILE="${COMPOSE_DIR}/compose.yml"
|
||||
|
||||
# Each Hermes worker gets its own volume on the NFS HoardingCow
|
||||
VOLUME_BASE="/mnt/HoardingCow_docker_data/Hermes"
|
||||
VOLUME_DIR="${VOLUME_BASE}/${NAME}"
|
||||
|
||||
# The Hermes container runs as UID 10000 (hermes user from Dockerfile)
|
||||
HERMES_UID=10000
|
||||
|
||||
# ── Validation ──────────────────────────────────────────────
|
||||
if ! [ -f "$COMPOSE_FILE" ]; then
|
||||
echo "❌ compose.yml not found at $COMPOSE_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep -q "^ ${NAME}:" "$COMPOSE_FILE"; then
|
||||
echo "❌ Service '${NAME}' already exists in ${COMPOSE_FILE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ── Generate unique API key ─────────────────────────────────
|
||||
# Used by Paperclip to authenticate against this worker's
|
||||
# Hermes API server (/v1/chat/completions)
|
||||
API_KEY="pc_worker_$(openssl rand -hex 16)"
|
||||
|
||||
# ── Find next available API port ────────────────────────────
|
||||
# Workers get sequential ports starting at 8650.
|
||||
# Scans compose.yml for existing API_SERVER_PORT values and
|
||||
# picks the next one.
|
||||
BASE_PORT=8650
|
||||
MAX_PORT=0
|
||||
while IFS= read -r line; do
|
||||
port="${line#*API_SERVER_PORT: \"}"
|
||||
port="${port%%\"*}"
|
||||
if [ -n "$port" ] && [ "$port" -gt "$MAX_PORT" ]; then
|
||||
MAX_PORT="$port"
|
||||
fi
|
||||
done < <(grep -oP 'API_SERVER_PORT:\s*"\d+"' "$COMPOSE_FILE" 2>/dev/null)
|
||||
|
||||
NEW_PORT=$((MAX_PORT + 1))
|
||||
if [ "$NEW_PORT" -lt "$BASE_PORT" ]; then
|
||||
NEW_PORT=$BASE_PORT
|
||||
fi
|
||||
|
||||
# ── Create volume directory (on NFS) ────────────────────────
|
||||
echo "📁 Creating volume directory: ${VOLUME_DIR}"
|
||||
mkdir -p "$VOLUME_DIR"
|
||||
|
||||
# Hermes container runs as UID 10000 — set ownership so the
|
||||
# container can write its config, sessions, skills
|
||||
if command -v chown &>/dev/null; then
|
||||
chown -R "${HERMES_UID}:${HERMES_UID}" "$VOLUME_DIR" 2>/dev/null || \
|
||||
echo "⚠ Could not chown ${VOLUME_DIR} — run with sudo if needed"
|
||||
fi
|
||||
|
||||
# Make it group-readable for debugging
|
||||
chmod 755 "$VOLUME_DIR" 2>/dev/null || true
|
||||
|
||||
# ── Append service to compose.yml ───────────────────────────
|
||||
echo "📝 Appending service '${NAME}' to compose.yml ..."
|
||||
|
||||
TMPFILE=$(mktemp)
|
||||
|
||||
awk -v name="$NAME" \
|
||||
-v port="$NEW_PORT" \
|
||||
-v api_key="$API_KEY" \
|
||||
-v token_var="$TOKEN_VAR" \
|
||||
'
|
||||
# Insert new worker service block just before the networks: section
|
||||
/^networks:/ {
|
||||
print ""
|
||||
print " " name ":"
|
||||
print " <<: *hermes-worker"
|
||||
print " container_name: " name
|
||||
print " environment:"
|
||||
print " API_SERVER_PORT: \"" port "\""
|
||||
print " API_SERVER_KEY: \"" api_key "\""
|
||||
print " DISCORD_BOT_TOKEN: ${" token_var "}"
|
||||
print " volumes:"
|
||||
print " - /mnt/HoardingCow_docker_data/Hermes/" name ":/opt/data"
|
||||
print ""
|
||||
}
|
||||
{ print }
|
||||
' "$COMPOSE_FILE" > "$TMPFILE" && mv "$TMPFILE" "$COMPOSE_FILE"
|
||||
|
||||
# ── Done ────────────────────────────────────────────────────
|
||||
echo ""
|
||||
echo "✅ Worker '${NAME}' provisioned successfully"
|
||||
echo ""
|
||||
echo "────────────────────────────────────────────"
|
||||
echo " NEXT STEPS"
|
||||
echo "────────────────────────────────────────────"
|
||||
echo ""
|
||||
echo "1. Add secrets to the agenix .env stack file:"
|
||||
echo ""
|
||||
echo " # ${NAME}"
|
||||
echo " ${TOKEN_VAR}=<paste-discord-bot-token-here>"
|
||||
echo ""
|
||||
echo "2. Restart the AI stack:"
|
||||
echo ""
|
||||
echo " systemctl restart ai_stack.service"
|
||||
echo ""
|
||||
echo "3. In Paperclip, create an agent with HTTP adapter:"
|
||||
echo ""
|
||||
echo " Endpoint: http://${NAME}:${NEW_PORT}/v1/chat/completions"
|
||||
echo " API Key: ${API_KEY}"
|
||||
echo ""
|
||||
echo "────────────────────────────────────────────"
|
||||
9
vpn/Dockerfile
Normal file
9
vpn/Dockerfile
Normal file
@@ -0,0 +1,9 @@
|
||||
# Custom wg-easy with iptables-nft (nftables-backed iptables)
|
||||
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
||||
FROM ghcr.io/wg-easy/wg-easy:latest
|
||||
|
||||
# The upstream image registers only iptables-legacy with update-alternatives.
|
||||
# iptables-nft binary exists but isn't registered as an alternative key.
|
||||
# Override the alternatives-managed symlinks directly.
|
||||
RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
|
||||
ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
|
||||
@@ -2,7 +2,10 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
wireguard:
|
||||
image: weejewel/wg-easy:latest
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
image: wg-easy-iptables-nft:latest
|
||||
container_name: wireguard
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
|
||||
Reference in New Issue
Block a user