Compare commits
1 Commits
fix/matrix
...
feat/7zz-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 9d2404d8f6 |
6
ai/compose.yml
Executable file → Normal file
6
ai/compose.yml
Executable file → Normal file
@@ -32,9 +32,11 @@ services:
|
||||
- default
|
||||
container_name: hermes
|
||||
entrypoint: ["/bin/bash", "-c",
|
||||
"bash /opt/data/hermes-tools/install.sh && . /opt/hermes/.venv/bin/activate && uv pip install openai 'mautrix[encryption]' -q && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||
"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
|
||||
environment:
|
||||
- OLLAMA_HOST=http://ollama:11434
|
||||
- API_SERVER_ENABLED=true
|
||||
@@ -56,8 +58,6 @@ services:
|
||||
- /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
|
||||
# Persist Python venv across container recreation (Matrix bridge deps, etc.)
|
||||
- /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
|
||||
devices:
|
||||
- /dev/kfd:/dev/kfd
|
||||
- /dev/dri:/dev/dri
|
||||
|
||||
@@ -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