Compare commits
28 Commits
feat/herme
...
feat/herme
| Author | SHA1 | Date | |
|---|---|---|---|
| 772da2e050 | |||
| 50ac7bb2c4 | |||
| d3f2e3b7b9 | |||
| 6a44120b1a | |||
| 38a1451689 | |||
| f9fb28d560 | |||
| bcc4b6d157 | |||
| 8d1ae7e632 | |||
| 29ae32a1c5 | |||
| 8dff094768 | |||
| ec08f5eb5d | |||
| 611e96b306 | |||
| f184ed957c | |||
| 2bf31c7ccc | |||
| f44f93e35a | |||
| 4cdd157e3f | |||
| 3ba0345887 | |||
| 27571ddb3f | |||
| 5e242eb946 | |||
| e607982b21 | |||
| 4627199217 | |||
| 3611d645db | |||
| 99ac8b5dcd | |||
| b517a65393 | |||
| 61a59dfac1 | |||
| 144678354f | |||
| 34b1cb83a0 | |||
| f8c2f864de |
31
.gitea/workflows/build-hermes.yml
Normal file
31
.gitea/workflows/build-hermes.yml
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
name: Build Hermes agent
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'ai/hermes/**'
|
||||||
|
- 'ai/compose.yml'
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'ai/hermes/**'
|
||||||
|
- 'ai/compose.yml'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: |
|
||||||
|
git clone -b "${{ github.head_ref || github.ref_name }}" \
|
||||||
|
https://gitea:${{ secrets.GITHUB_TOKEN }}@code.lazyworkhorse.net/gortium/compose.git .
|
||||||
|
git log --oneline -3
|
||||||
|
|
||||||
|
- name: Build hermes image
|
||||||
|
run: |
|
||||||
|
cd ai
|
||||||
|
docker compose build hermes 2>&1
|
||||||
|
|
||||||
|
- name: Verify image
|
||||||
|
run: |
|
||||||
|
docker run --rm ai-hermes /opt/hermes/.venv/bin/python --version 2>&1
|
||||||
31
.gitea/workflows/build-ollama.yml
Normal file
31
.gitea/workflows/build-ollama.yml
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
name: Build ollama (gfx906)
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'ai/ollama/**'
|
||||||
|
- 'ai/compose.yml'
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
|
paths:
|
||||||
|
- 'ai/ollama/**'
|
||||||
|
- 'ai/compose.yml'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: |
|
||||||
|
git clone -b "${{ github.head_ref || github.ref_name }}" \
|
||||||
|
https://gitea:${{ secrets.GITHUB_TOKEN }}@code.lazyworkhorse.net/gortium/compose.git .
|
||||||
|
git log --oneline -3
|
||||||
|
|
||||||
|
- name: Build ollama image
|
||||||
|
run: |
|
||||||
|
cd ai
|
||||||
|
docker compose build ollama --no-cache 2>&1
|
||||||
|
|
||||||
|
- name: Verify version
|
||||||
|
run: |
|
||||||
|
docker run --rm ollama/ollama:rocm-gfx906 ollama --version 2>&1
|
||||||
@@ -31,6 +31,9 @@ services:
|
|||||||
ssh:
|
ssh:
|
||||||
- default
|
- default
|
||||||
container_name: hermes
|
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
|
restart: always
|
||||||
# Gateway run enables the internal API server on port 8642
|
# Gateway run enables the internal API server on port 8642
|
||||||
command: gateway run
|
command: gateway run
|
||||||
@@ -51,6 +54,10 @@ services:
|
|||||||
- TZ=America/Montreal
|
- TZ=America/Montreal
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
||||||
|
# Syncthing-shared org files — read-only view of user's agenda
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
|
||||||
|
# Syncthing-shared inbox — write tasks here, they sync to user's laptop
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
|
||||||
devices:
|
devices:
|
||||||
- /dev/kfd:/dev/kfd
|
- /dev/kfd:/dev/kfd
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
@@ -60,6 +67,35 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
|
|
||||||
|
syncthing:
|
||||||
|
image: syncthing/syncthing:latest
|
||||||
|
container_name: syncthing
|
||||||
|
hostname: syncthing
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- "8384:8384"
|
||||||
|
- "22000:22000"
|
||||||
|
- "21027:21027/udp"
|
||||||
|
environment:
|
||||||
|
- TZ=America/Montreal
|
||||||
|
volumes:
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
|
||||||
|
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
|
||||||
|
networks:
|
||||||
|
- ai_backend
|
||||||
|
- ai_net
|
||||||
|
labels:
|
||||||
|
- "traefik.enable=true"
|
||||||
|
- "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||||
|
- "traefik.http.routers.syncthing-http.entrypoints=web"
|
||||||
|
- "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
|
||||||
|
- "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
|
||||||
|
- "traefik.http.routers.syncthing-https.entrypoints=websecure"
|
||||||
|
- "traefik.http.routers.syncthing-https.tls=true"
|
||||||
|
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
||||||
|
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
||||||
|
|
||||||
ollama:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
|
|||||||
@@ -1,74 +1,106 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
# Hermes Agent -- custom fork build
|
# Hermes Agent with Chromium -- local browser tool support
|
||||||
# Builds on top of official image + overlays our forked source from Gitea.
|
# Based on python:3.11-slim for minimal footprint.
|
||||||
# Requires Docker BuildKit. Pass SSH agent for git clone:
|
# Chromium installed via apt-get for system-level browser automation.
|
||||||
# docker compose build hermes
|
#
|
||||||
# Or manually:
|
# Build:
|
||||||
# DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
|
# docker build -t hermes-agent:chromium .
|
||||||
|
#
|
||||||
|
# Environment variables:
|
||||||
|
# CHROME_EXECUTABLE -- path to the Chromium binary
|
||||||
|
|
||||||
# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
|
# ---------- Base image ----------
|
||||||
FROM nousresearch/hermes-agent:latest
|
FROM python:3.11-slim
|
||||||
|
|
||||||
# ---------- Overlay our forked source ----------
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
# Uses SSH agent forwarding from the build host (no key baked into image).
|
ENV PYTHONUNBUFFERED=1
|
||||||
# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
|
|
||||||
# Only the Python source, web UI source, and config change.
|
|
||||||
RUN --mount=type=ssh \
|
|
||||||
mkdir -p /root/.ssh && \
|
|
||||||
ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
|
|
||||||
cd /tmp && \
|
|
||||||
GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
|
|
||||||
git clone --depth 1 --branch main \
|
|
||||||
git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
|
|
||||||
rsync -a --delete fork/ /opt/hermes/ \
|
|
||||||
--exclude node_modules \
|
|
||||||
--exclude .venv \
|
|
||||||
--exclude .git && \
|
|
||||||
rm -rf /tmp/fork /root/.ssh/
|
|
||||||
|
|
||||||
# ---------- Rebuild web UI ----------
|
# ---------- System dependencies for Chromium ----------
|
||||||
# Source files changed; node_modules (from base image) reused.
|
# The minimum set required to run headless Chromium on Linux.
|
||||||
RUN cd /opt/hermes && npm run build
|
# python:3.11-slim is Debian Bookworm (12) -- package names without t64 suffix.
|
||||||
|
|
||||||
# ---------- Reinstall Python package (editable) ----------
|
|
||||||
# Picks up source changes from our fork.
|
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
|
||||||
uv pip install --no-cache-dir --no-deps -e /opt/hermes
|
|
||||||
|
|
||||||
# ---------- Extra system deps ----------
|
|
||||||
USER root
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
libportaudio2 ca-certificates poppler-utils imagemagick \
|
# Chromium and its launcher
|
||||||
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
chromium \
|
||||||
texlive-xetex texlive-science \
|
chromium-common \
|
||||||
qemu-user-static binfmt-support emacs-nox && \
|
chromium-sandbox \
|
||||||
rm -rf /var/lib/apt/lists/*
|
# Font rendering for proper page rendering
|
||||||
|
fonts-liberation \
|
||||||
|
fonts-noto-color-emoji \
|
||||||
|
fonts-dejavu-core \
|
||||||
|
# System libraries required by Chromium at runtime
|
||||||
|
libnss3 \
|
||||||
|
libnspr4 \
|
||||||
|
libatk1.0-0 \
|
||||||
|
libatk-bridge2.0-0 \
|
||||||
|
libcups2 \
|
||||||
|
libdrm2 \
|
||||||
|
libxdamage1 \
|
||||||
|
libxfixes3 \
|
||||||
|
libxcomposite1 \
|
||||||
|
libxrandr2 \
|
||||||
|
libgbm1 \
|
||||||
|
libpango-1.0-0 \
|
||||||
|
libcairo2 \
|
||||||
|
libasound2 \
|
||||||
|
libxkbcommon0 \
|
||||||
|
libxshmfence1 \
|
||||||
|
# Virtual framebuffer for headless operation
|
||||||
|
xvfb \
|
||||||
|
# Process supervisor for orphan reaping
|
||||||
|
tini \
|
||||||
|
# Git for Hermes source operations
|
||||||
|
git \
|
||||||
|
# SSL certificates for HTTPS connections
|
||||||
|
ca-certificates \
|
||||||
|
# Curl for health checks
|
||||||
|
curl \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# ---------- UV ----------
|
# ---------- Hermes Agent installation ----------
|
||||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
# Install uv (fast Python package manager)
|
||||||
|
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
|
||||||
|
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uvx /usr/local/bin/uvx
|
||||||
|
|
||||||
# ---------- Piper TTS ----------
|
# Create hermes user (non-root runtime)
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
RUN useradd -u 10000 -m -d /opt/data hermes
|
||||||
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
|
||||||
mkdir -p /opt/hermes/.venv/share/piper/voices
|
|
||||||
|
|
||||||
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
# Install Hermes Agent from PyPI with gateway support for messaging
|
||||||
import urllib.request
|
RUN uv pip install --system --no-cache-dir \
|
||||||
base = '/opt/hermes/.venv/share/piper/voices'
|
'hermes-agent[gateway]' \
|
||||||
url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
|
croniter && \
|
||||||
urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
|
uv cache clean
|
||||||
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
|
||||||
PYEOF
|
# Create the /opt/hermes directory structure expected by entrypoint
|
||||||
|
RUN mkdir -p /opt/hermes/.venv/bin && \
|
||||||
|
mkdir -p /opt/hermes/docker && \
|
||||||
|
ln -sf /usr/local/bin/uv /opt/hermes/.venv/bin/uv && \
|
||||||
|
ln -sf /usr/local/bin/uvx /opt/hermes/.venv/bin/uvx
|
||||||
|
|
||||||
|
# ---------- Entrypoint script ----------
|
||||||
|
COPY entrypoint.sh /opt/hermes/docker/entrypoint.sh
|
||||||
|
RUN chmod +x /opt/hermes/docker/entrypoint.sh
|
||||||
|
|
||||||
|
# ---------- Environment variables ----------
|
||||||
|
# Point browser tool to system Chromium (installed via apt-get)
|
||||||
|
ENV CHROME_EXECUTABLE=/usr/bin/chromium
|
||||||
|
|
||||||
|
# Hermes paths
|
||||||
|
ENV HERMES_HOME=/opt/data
|
||||||
|
ENV PATH="/opt/data/.local/bin:${PATH}"
|
||||||
|
|
||||||
|
# Playwright browsers path (for agent-browser install at runtime)
|
||||||
|
ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
|
||||||
|
|
||||||
|
# Virtual framebuffer display for headless Chromium
|
||||||
|
ENV DISPLAY=:99
|
||||||
|
|
||||||
|
# ---------- Data volume ----------
|
||||||
|
VOLUME [ "/opt/data" ]
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
WORKDIR /opt/data
|
||||||
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" ]
|
ENTRYPOINT [ "/opt/hermes/docker/entrypoint.sh" ]
|
||||||
|
CMD [ "gateway", "run" ]
|
||||||
COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
|
|
||||||
ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
|
|
||||||
|
|||||||
20
ai/hermes/entrypoint.sh
Normal file
20
ai/hermes/entrypoint.sh
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Hermes Agent entrypoint script
|
||||||
|
# Installs custom tools and runtime dependencies,
|
||||||
|
# then delegates to the passed command (usually "gateway run").
|
||||||
|
|
||||||
|
# Install custom tools from persistent volume if available
|
||||||
|
if [ -f /opt/data/hermes-tools/install.sh ]; then
|
||||||
|
bash /opt/data/hermes-tools/install.sh
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install additional runtime deps (idempotent)
|
||||||
|
if command -v uv &>/dev/null; then
|
||||||
|
uv pip install --system --no-cache-dir --quiet \
|
||||||
|
openai mautrix[encryption] 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Execute the passed command with tini for proper signal handling
|
||||||
|
exec tini -g -- "$@"
|
||||||
@@ -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 "$@"
|
|
||||||
73
ai/hermes/himalaya-ro.sh
Normal file
73
ai/hermes/himalaya-ro.sh
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
# himalaya-ro — Read-only wrapper for himalaya
|
||||||
|
#
|
||||||
|
# Blocks destructive commands and logs audit trail.
|
||||||
|
# Pass-through for read-only commands (list, read, search).
|
||||||
|
#
|
||||||
|
# Usage: himalaya-ro [options] <command> [args...]
|
||||||
|
#
|
||||||
|
# Install: place in PATH before the real himalaya, or use
|
||||||
|
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
||||||
|
# ─────────────────────────────────────────────────────────────
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
# ── Configuration ───────────────────────────────────────────
|
||||||
|
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
||||||
|
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
||||||
|
|
||||||
|
# ── Destructive commands we block ──────────────────────────
|
||||||
|
BLOCKED_CMDS=(
|
||||||
|
"message move"
|
||||||
|
"message delete"
|
||||||
|
"message copy"
|
||||||
|
"flag add"
|
||||||
|
"flag remove"
|
||||||
|
"folder create"
|
||||||
|
"folder delete"
|
||||||
|
"folder rename"
|
||||||
|
"template send"
|
||||||
|
"account configure"
|
||||||
|
"account delete"
|
||||||
|
)
|
||||||
|
|
||||||
|
# ── Determine the subcommand being invoked ─────────────────
|
||||||
|
# Strip leading options (--account, --output, etc.) to find the verb
|
||||||
|
ARGS=()
|
||||||
|
SKIP_NEXT=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
if $SKIP_NEXT; then
|
||||||
|
SKIP_NEXT=false
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
if [[ "$arg" == --* ]]; then
|
||||||
|
case "$arg" in
|
||||||
|
--account|--output|--page|--page-size|--folder|--color|--format)
|
||||||
|
SKIP_NEXT=true ;;
|
||||||
|
esac
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
ARGS+=("$arg")
|
||||||
|
done
|
||||||
|
|
||||||
|
# Build subcommand string and check against blocklist
|
||||||
|
CMD_STR=""
|
||||||
|
for ((i=0; i<${#ARGS[@]}; i++)); do
|
||||||
|
if [ -z "$CMD_STR" ]; then
|
||||||
|
CMD_STR="${ARGS[$i]}"
|
||||||
|
else
|
||||||
|
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
||||||
|
fi
|
||||||
|
for blocked in "${BLOCKED_CMDS[@]}"; do
|
||||||
|
if [[ "$CMD_STR" == "$blocked" ]]; then
|
||||||
|
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
|
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
||||||
|
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
||||||
|
echo " Audit log: $AUDIT_LOG" >&2
|
||||||
|
exit 100
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
# ── Allow pass-through ─────────────────────────────────────
|
||||||
|
exec "$HIMALAYA_BIN" "$@"
|
||||||
@@ -7,12 +7,11 @@ services:
|
|||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
- USER_GID=1000
|
- USER_GID=1000
|
||||||
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
||||||
|
- GITEA__actions__ENABLED=true
|
||||||
- SSH_PORT=2222
|
- SSH_PORT=2222
|
||||||
- SSH_LISTEN_PORT=2222
|
- SSH_LISTEN_PORT=2222
|
||||||
# Enable Gitea Actions (act_runner required on host)
|
# Enable Gitea Actions (act_runner required on host)
|
||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
# Don't fetch actions from GitHub (offline mode + local only)
|
|
||||||
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||||
networks:
|
networks:
|
||||||
@@ -44,6 +43,22 @@ services:
|
|||||||
# Internal Routing
|
# Internal Routing
|
||||||
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
||||||
|
|
||||||
|
act_runner:
|
||||||
|
image: gitea/act_runner:latest
|
||||||
|
container_name: act_runner
|
||||||
|
environment:
|
||||||
|
- GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
|
||||||
|
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
|
||||||
|
- GITEA_RUNNER_NAME=ai-host-runner
|
||||||
|
- GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
networks:
|
||||||
|
- vc_net
|
||||||
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- gitea
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
vc_net:
|
vc_net:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
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:
|
services:
|
||||||
wireguard:
|
wireguard:
|
||||||
image: weejewel/wg-easy:latest
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
image: wg-easy-iptables-nft:latest
|
||||||
container_name: wireguard
|
container_name: wireguard
|
||||||
cap_add:
|
cap_add:
|
||||||
- NET_ADMIN
|
- NET_ADMIN
|
||||||
|
|||||||
Reference in New Issue
Block a user