feat: compose tor+ollama separation; runner uses OLLAMA_BASE; modelfiles mount
This commit is contained in:
parent
efcadefc19
commit
9b9666485f
|
|
@ -0,0 +1,12 @@
|
|||
version: "3.9"
|
||||
services:
|
||||
ollama:
|
||||
networks: [komnet]
|
||||
volumes:
|
||||
- /home/kompanion/ollama:/root/.ollama
|
||||
runner:
|
||||
environment:
|
||||
OLLAMA_BASE_URL: http://ollama:11434
|
||||
networks:
|
||||
komnet:
|
||||
internal: false
|
||||
|
|
@ -1,29 +1,27 @@
|
|||
version: "3.9"
|
||||
name: metal-kompanion
|
||||
|
||||
networks:
|
||||
komnet:
|
||||
driver: bridge
|
||||
internal: true
|
||||
komnet: {} # runner ↔ tor ↔ ollama
|
||||
netpub: {} # egress to internet for tor + ollama
|
||||
|
||||
services:
|
||||
# Local model host
|
||||
ollama:
|
||||
image: ollama/ollama:latest
|
||||
restart: unless-stopped
|
||||
ports: ["127.0.0.1:11434:11434"]
|
||||
volumes:
|
||||
- ollama:/root/.ollama
|
||||
networks: [komnet]
|
||||
|
||||
# TOR proxy (SOCKS5)
|
||||
tor:
|
||||
image: dperson/torproxy
|
||||
restart: unless-stopped
|
||||
command: -a 0.0.0.0
|
||||
ports: ["127.0.0.1:9050:9050"]
|
||||
networks: [komnet]
|
||||
ports: ["127.0.0.1:9051:9051"] # optional host exposure
|
||||
networks: [komnet, netpub]
|
||||
|
||||
ollama:
|
||||
image: ollama/ollama:latest
|
||||
restart: unless-stopped
|
||||
ports: ["127.0.0.1:11435:11435"] # expose to host for tools if desired
|
||||
volumes:
|
||||
- ollama:/root/.ollama # persist models once
|
||||
- /home/kompanion/ollama-modelfiles:/modelfiles # your custom Modelfiles/LoRA
|
||||
networks: [komnet, netpub] # can reach registry.ollama.ai
|
||||
|
||||
# Companion runner (Python) — reads tasks.jsonl, writes journal/ledger
|
||||
runner:
|
||||
image: python:3.11-slim
|
||||
restart: unless-stopped
|
||||
|
|
@ -32,9 +30,9 @@ services:
|
|||
XDG_STATE_HOME: /state
|
||||
XDG_CONFIG_HOME: /config
|
||||
XDG_CACHE_HOME: /cache
|
||||
# Route all egress through TOR by default (except localhost)
|
||||
ALL_PROXY: socks5h://tor:9050
|
||||
NO_PROXY: 127.0.0.1,localhost
|
||||
ALL_PROXY: socks5h://tor:9051
|
||||
NO_PROXY: ollama,localhost,127.0.0.1
|
||||
OLLAMA_BASE: http://ollama:11435 # talk to container by DNS name
|
||||
depends_on: [ollama, tor]
|
||||
volumes:
|
||||
- /home/kompanion/.local/state/kompanion:/state/kompanion
|
||||
|
|
@ -45,4 +43,4 @@ services:
|
|||
networks: [komnet]
|
||||
|
||||
volumes:
|
||||
ollama:
|
||||
ollama: {}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
#!/usr/bin/env python3
|
||||
import time
|
||||
while True: time.sleep(3600)
|
||||
base = os.environ.get("OLLAMA_BASE", "http://ollama:11434")
|
||||
url = f"{base}/api/generate"
|
||||
|
|
|
|||
Loading…
Reference in New Issue