Compare commits
7 Commits
37bf43c3ea
...
merge/netw
| Author | SHA1 | Date | |
|---|---|---|---|
| d7449e93c1 | |||
| d3f2e3b7b9 | |||
| 6a44120b1a | |||
| 38a1451689 | |||
| f9fb28d560 | |||
| bcc4b6d157 | |||
|
|
28a172e828 |
@@ -54,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
|
||||||
@@ -63,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
|
||||||
@@ -96,62 +129,6 @@ services:
|
|||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
|
|
||||||
paperclip-db:
|
|
||||||
image: postgres:17-alpine
|
|
||||||
container_name: paperclip-db
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: paperclip
|
|
||||||
POSTGRES_PASSWORD: ${PAPERCLIP_DB_PASSWORD:?PAPERCLIP_DB_PASSWORD must be set}
|
|
||||||
POSTGRES_DB: paperclip
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U paperclip -d paperclip"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/pgdata:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
paperclip:
|
|
||||||
build:
|
|
||||||
context: ./paperclip
|
|
||||||
container_name: paperclip
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:3100:3100"
|
|
||||||
environment:
|
|
||||||
- HOST=0.0.0.0
|
|
||||||
- PORT=3100
|
|
||||||
- SERVE_UI=true
|
|
||||||
- DATABASE_URL=postgres://paperclip:${PAPERCLIP_DB_PASSWORD}@paperclip-db:5432/paperclip
|
|
||||||
- BETTER_AUTH_SECRET=${PAPERCLIP_AUTH_SECRET:?PAPERCLIP_AUTH_SECRET must be set}
|
|
||||||
- PAPERCLIP_PUBLIC_URL=https://paperclip.lazyworkhorse.net
|
|
||||||
- PAPERCLIP_DEPLOYMENT_MODE=authenticated
|
|
||||||
- PAPERCLIP_DEPLOYMENT_EXPOSURE=private
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/data:/paperclip
|
|
||||||
depends_on:
|
|
||||||
paperclip-db:
|
|
||||||
condition: service_healthy
|
|
||||||
networks:
|
|
||||||
- ai_net
|
|
||||||
- ai_backend
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-http.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.paperclip-http.middlewares=redirect-to-https"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-https.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls=true"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls.certresolver=njalla"
|
|
||||||
|
|
||||||
- "traefik.http.services.paperclip.loadbalancer.server.port=3100"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
# syntax=docker/dockerfile:1.20
|
|
||||||
FROM ghcr.io/paperclipai/paperclip:v2026.517.0
|
|
||||||
|
|
||||||
# ── Install Hermes adapter npm package into seed directory ──────────
|
|
||||||
# This seed data gets copied to the persistent volume on first boot
|
|
||||||
# so the adapter is available without network access.
|
|
||||||
USER root
|
|
||||||
|
|
||||||
RUN npm install --no-save --prefix /opt/paperclip-seed/adapter-plugins \
|
|
||||||
hermes-paperclip-adapter@0.3.0
|
|
||||||
|
|
||||||
# Create adapter-plugins.json metadata (Paperclip reads this on startup
|
|
||||||
# to discover which external adapters to load)
|
|
||||||
RUN mkdir -p /opt/paperclip-seed && python3 -c "
|
|
||||||
import json
|
|
||||||
record = {
|
|
||||||
'packageName': 'hermes-paperclip-adapter',
|
|
||||||
'version': '0.3.0',
|
|
||||||
'type': 'hermes',
|
|
||||||
'installedAt': '2026-05-18T00:00:00.000Z',
|
|
||||||
}
|
|
||||||
with open('/opt/paperclip-seed/adapter-plugins.json', 'w') as f:
|
|
||||||
json.dump([record], f, indent=2)
|
|
||||||
"
|
|
||||||
|
|
||||||
# Ensure the adapter-plugins dir has a package.json (Paperclip expects one)
|
|
||||||
RUN python3 -c "
|
|
||||||
import json
|
|
||||||
pkg = {
|
|
||||||
'name': 'paperclip-adapter-plugins',
|
|
||||||
'version': '0.0.0',
|
|
||||||
'private': True,
|
|
||||||
'description': 'Managed directory for Paperclip external adapter plugins.',
|
|
||||||
}
|
|
||||||
with open('/opt/paperclip-seed/adapter-plugins/package.json', 'w') as f:
|
|
||||||
json.dump(pkg, f, indent=2)
|
|
||||||
"
|
|
||||||
|
|
||||||
# ── Custom entrypoint ──────────────────────────────────────────────
|
|
||||||
# Seeds the Hermes adapter on fresh volumes, then runs original logic.
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/paperclip-entrypoint.sh
|
|
||||||
RUN chmod +x /usr/local/bin/paperclip-entrypoint.sh
|
|
||||||
|
|
||||||
USER node
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/paperclip-entrypoint.sh"]
|
|
||||||
CMD ["node", "--import", "./server/node_modules/tsx/dist/loader.mjs", "server/dist/index.js"]
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# ── Seed Hermes adapter if volume is fresh ──────────────────────────
|
|
||||||
PAPERCLIP_HOME="${PAPERCLIP_HOME:-/paperclip}"
|
|
||||||
if [ ! -f "${PAPERCLIP_HOME}/adapter-plugins.json" ]; then
|
|
||||||
echo "[paperclip] Seeding Hermes adapter plugin..."
|
|
||||||
cp -r /opt/paperclip-seed/* "${PAPERCLIP_HOME}/"
|
|
||||||
chown -R "${USER_UID:-1000}:${USER_GID:-1000}" \
|
|
||||||
"${PAPERCLIP_HOME}/adapter-plugins" \
|
|
||||||
"${PAPERCLIP_HOME}/adapter-plugins.json"
|
|
||||||
echo "[paperclip] Hermes adapter seeded. Ready to create Hermes agents."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Original entrypoint logic (UID/GID adjustment) ──────────────────
|
|
||||||
PUID="${USER_UID:-1000}"
|
|
||||||
PGID="${USER_GID:-1000}"
|
|
||||||
changed=0
|
|
||||||
|
|
||||||
if [ "$(id -u node)" -ne "$PUID" ]; then
|
|
||||||
usermod -o -u "$PUID" node
|
|
||||||
changed=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$(id -g node)" -ne "$PGID" ]; then
|
|
||||||
groupmod -o -g "$PGID" node
|
|
||||||
usermod -g "$PGID" node
|
|
||||||
changed=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$changed" = "1" ]; then
|
|
||||||
chown -R node:node "${PAPERCLIP_HOME}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec gosu node "$@"
|
|
||||||
@@ -96,5 +96,5 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
backup_net:
|
backup_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: backup_net
|
name: backup_net
|
||||||
|
|||||||
@@ -82,37 +82,37 @@ networks:
|
|||||||
driver: bridge
|
driver: bridge
|
||||||
name: traefik_backend
|
name: traefik_backend
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: ai_net
|
name: ai_net
|
||||||
auth_net:
|
auth_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: auth_net
|
name: auth_net
|
||||||
backup_net:
|
backup_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: backup_net
|
name: backup_net
|
||||||
cloud_net:
|
cloud_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: cloud_net
|
name: cloud_net
|
||||||
coms_net:
|
coms_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: coms_net
|
name: coms_net
|
||||||
finance_net:
|
finance_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: finance_net
|
name: finance_net
|
||||||
home_auto_net:
|
home_auto_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: home_auto_net
|
name: home_auto_net
|
||||||
homepage_net:
|
homepage_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: homepage_net
|
name: homepage_net
|
||||||
passman_net:
|
passman_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: passman_net
|
name: passman_net
|
||||||
tak_net:
|
tak_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: tak_net
|
name: tak_net
|
||||||
vc_net:
|
vc_net:
|
||||||
external: true
|
driver: bridge
|
||||||
name: vc_net
|
name: vc_net
|
||||||
|
|
||||||
# duckdns:
|
# duckdns:
|
||||||
|
|||||||
Reference in New Issue
Block a user