Compare commits

..

2 Commits

Author SHA1 Message Date
d7449e93c1 Merge PR #45: fix: create networks as bridge instead of external 2026-05-20 14:39:35 -04:00
Thierry Pouplier
28a172e828 fix: create networks as bridge instead of external
- Changed all networks from external: true to driver: bridge
- Fixes chicken-and-egg problem where networks must exist before stacks can start
- backup_net, ai_net, auth_net, cloud_net, coms_net, finance_net, home_auto_net, homepage_net, passman_net, tak_net, vc_net now created automatically
2026-04-29 18:42:09 +00:00
3 changed files with 12 additions and 45 deletions

View File

@@ -79,39 +79,6 @@ PYEOF
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro 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 ---------- # ---------- Runtime ----------
USER hermes USER hermes
ENV HERMES_HOME=/opt/data ENV HERMES_HOME=/opt/data

View File

@@ -96,5 +96,5 @@ services:
networks: networks:
backup_net: backup_net:
external: true driver: bridge
name: backup_net name: backup_net

View File

@@ -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: