Compare commits
1 Commits
merge/netw
...
feat/docke
| Author | SHA1 | Date | |
|---|---|---|---|
| c39174f0fe |
@@ -54,10 +54,6 @@ 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
|
||||||
@@ -67,35 +63,6 @@ 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
|
||||||
|
|||||||
@@ -78,6 +78,47 @@ PYEOF
|
|||||||
# ---------- Install himalaya-ro wrapper ----------
|
# ---------- Install himalaya-ro wrapper ----------
|
||||||
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 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
|
||||||
|
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()
|
||||||
|
|
||||||
|
links = re.findall(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
|
||||||
|
if not links:
|
||||||
|
raise RuntimeError("Could not find 7z download link")
|
||||||
|
|
||||||
|
dl_url = f'https://7-zip.org/{links[0]}'
|
||||||
|
print(f'Downloading 7z from {dl_url}...')
|
||||||
|
req = urllib.request.Request(dl_url, headers={'User-Agent': 'Mozilla/5.0'})
|
||||||
|
r = urllib.request.urlopen(req, timeout=30)
|
||||||
|
data = r.read()
|
||||||
|
|
||||||
|
with open('/tmp/7z.tar.xz', 'wb') as f:
|
||||||
|
f.write(data)
|
||||||
|
|
||||||
|
subprocess.run(['tar', '-xJf', '/tmp/7z.tar.xz', '-C', '/tmp/'], check=True)
|
||||||
|
|
||||||
|
for root, dirs, files in os.walk('/tmp'):
|
||||||
|
for f in files:
|
||||||
|
if f == '7zz':
|
||||||
|
src = os.path.join(root, f)
|
||||||
|
shutil.move(src, '/usr/local/bin/7zz')
|
||||||
|
os.chmod('/usr/local/bin/7zz', 0o755)
|
||||||
|
print(f'7zz installed from {src}')
|
||||||
|
break
|
||||||
|
|
||||||
|
os.remove('/tmp/7z.tar.xz')
|
||||||
|
|
||||||
|
# Verify
|
||||||
|
r = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
|
||||||
|
print(f'7-Zip {r.stdout.strip()[:60]}')
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
|
|||||||
@@ -96,5 +96,5 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
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:
|
||||||
driver: bridge
|
external: true
|
||||||
name: ai_net
|
name: ai_net
|
||||||
auth_net:
|
auth_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: auth_net
|
name: auth_net
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: backup_net
|
name: backup_net
|
||||||
cloud_net:
|
cloud_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: cloud_net
|
name: cloud_net
|
||||||
coms_net:
|
coms_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: coms_net
|
name: coms_net
|
||||||
finance_net:
|
finance_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: finance_net
|
name: finance_net
|
||||||
home_auto_net:
|
home_auto_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: home_auto_net
|
name: home_auto_net
|
||||||
homepage_net:
|
homepage_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: homepage_net
|
name: homepage_net
|
||||||
passman_net:
|
passman_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: passman_net
|
name: passman_net
|
||||||
tak_net:
|
tak_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: tak_net
|
name: tak_net
|
||||||
vc_net:
|
vc_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: vc_net
|
name: vc_net
|
||||||
|
|
||||||
# duckdns:
|
# duckdns:
|
||||||
|
|||||||
@@ -8,10 +8,13 @@ services:
|
|||||||
- USER_GID=1000
|
- USER_GID=1000
|
||||||
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
|
||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
|
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||||
- SSH_PORT=2222
|
- SSH_PORT=2222
|
||||||
- SSH_LISTEN_PORT=2222
|
- SSH_LISTEN_PORT=2222
|
||||||
# Enable Gitea Actions (act_runner required on host)
|
# Enable Gitea Actions (act_runner required on host)
|
||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
|
# Don't fetch actions from GitHub (offline mode + local only)
|
||||||
|
- GITEA__actions__DEFAULT_ACTIONS_URL=off
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
Reference in New Issue
Block a user