Compare commits
4 Commits
fix/vpn-ip
...
feat/docke
| Author | SHA1 | Date | |
|---|---|---|---|
| c39174f0fe | |||
| 29ae32a1c5 | |||
| 8dff094768 | |||
| ec08f5eb5d |
@@ -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
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
|
||||||
FROM ghcr.io/wg-easy/wg-easy:latest
|
FROM ghcr.io/wg-easy/wg-easy:latest
|
||||||
|
|
||||||
# The upstream image defaults to iptables-legacy via update-alternatives.
|
# The upstream image registers only iptables-legacy with update-alternatives.
|
||||||
# Switch iptables to the nftables backend (already provided by the 'iptables'
|
# iptables-nft binary exists but isn't registered as an alternative key.
|
||||||
# package on Alpine 3.18+). No apk add needed — iptables-nft is built-in.
|
# Override the alternatives-managed symlinks directly.
|
||||||
RUN update-alternatives --set iptables /usr/sbin/iptables-nft && \
|
RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
|
||||||
update-alternatives --set ip6tables /usr/sbin/ip6tables-nft
|
ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
|
||||||
|
|||||||
Reference in New Issue
Block a user