Compare commits
6 Commits
8d1ae7e632
...
feat/7zz-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d2404d8f6 | |||
| d3f2e3b7b9 | |||
| 6a44120b1a | |||
| 38a1451689 | |||
| f9fb28d560 | |||
| bcc4b6d157 |
@@ -54,6 +54,10 @@ services:
|
||||
- TZ=America/Montreal
|
||||
volumes:
|
||||
- /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:
|
||||
- /dev/kfd:/dev/kfd
|
||||
- /dev/dri:/dev/dri
|
||||
@@ -63,6 +67,35 @@ services:
|
||||
networks:
|
||||
- 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:
|
||||
build:
|
||||
context: ./ollama
|
||||
|
||||
@@ -79,6 +79,39 @@ PYEOF
|
||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
||||
|
||||
|
||||
# ---------- Install 7-Zip (7zz) for CHM extraction ----------
|
||||
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||
import urllib.request, tarfile, os, shutil, re, subprocess
|
||||
|
||||
# Scrape 7-zip.org for latest Linux x64 binary link
|
||||
url = 'https://7-zip.org/download.html'
|
||||
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||
r = urllib.request.urlopen(req, timeout=15)
|
||||
html = r.read().decode()
|
||||
match = re.search(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||
if not match:
|
||||
raise RuntimeError('Could not find 7z Linux x64 download link on 7-zip.org')
|
||||
dl_url = f'https://7-zip.org/{match.group(1)}'
|
||||
|
||||
# Follow Himalaya pattern: download, extract, install, verify
|
||||
xz = '/tmp/7z.tar.xz'
|
||||
urllib.request.urlretrieve(dl_url, xz)
|
||||
os.makedirs('/tmp/7z', exist_ok=True)
|
||||
with tarfile.open(xz, 'r:xz') as t:
|
||||
t.extractall('/tmp/7z')
|
||||
shutil.move('/tmp/7z/7zz', '/usr/local/bin/7zz')
|
||||
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||
shutil.rmtree('/tmp/7z', ignore_errors=True)
|
||||
os.remove(xz)
|
||||
|
||||
# Verify
|
||||
result = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||
assert result.returncode == 0, f'7zz verify failed: {result.stderr}'
|
||||
version = result.stdout.split()[2] if result.stdout else 'unknown'
|
||||
print(f'7-Zip {version} installed successfully')
|
||||
PYEOF
|
||||
|
||||
|
||||
# ---------- Runtime ----------
|
||||
USER hermes
|
||||
ENV HERMES_HOME=/opt/data
|
||||
|
||||
Reference in New Issue
Block a user