Compare commits
11 Commits
261536d74d
...
6d5d1c8f73
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d5d1c8f73 | |||
| df0dca22ae | |||
| 5796d67c02 | |||
| 4e97c70256 | |||
| d47d230c25 | |||
| 3596ac5219 | |||
| 802c71cf4e | |||
| 8ce9f7189f | |||
| e3f47cac6b | |||
| 04dcca1aa7 | |||
| 01fbf2ab62 |
@@ -32,7 +32,7 @@ services:
|
|||||||
- default
|
- default
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
entrypoint: ["/bin/bash", "-c",
|
entrypoint: ["/bin/bash", "-c",
|
||||||
"bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
"bash /opt/data/hermes-tools/install.sh && bash /opt/data/hermes-tools/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
||||||
"hermes-entrypoint"]
|
"hermes-entrypoint"]
|
||||||
restart: always
|
restart: always
|
||||||
# Gateway run enables the internal API server on port 8642
|
# Gateway run enables the internal API server on port 8642
|
||||||
@@ -127,7 +127,6 @@ services:
|
|||||||
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
|
||||||
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
|
||||||
|
|
||||||
|
|
||||||
ollama:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
|
|||||||
@@ -43,12 +43,6 @@ RUN apt-get update && \
|
|||||||
# ---------- UV ----------
|
# ---------- UV ----------
|
||||||
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
|
||||||
|
|
||||||
# ---------- Matrix bridge + extra pip deps ----------
|
|
||||||
# Previously installed inline at container startup and persisted via volume mount.
|
|
||||||
# Now baked into the image so the fragile venv volume mount can be removed.
|
|
||||||
RUN . /opt/hermes/.venv/bin/activate && \
|
|
||||||
uv pip install --no-cache-dir 'mautrix[encryption]' openai
|
|
||||||
|
|
||||||
WORKDIR /opt/hermes
|
WORKDIR /opt/hermes
|
||||||
|
|
||||||
# ---------- Matrix bridge + extra pip deps ----------
|
# ---------- Matrix bridge + extra pip deps ----------
|
||||||
@@ -84,10 +78,6 @@ os.remove(tgz)
|
|||||||
print('himalaya v1.2.0 installed')
|
print('himalaya v1.2.0 installed')
|
||||||
PYEOF
|
PYEOF
|
||||||
|
|
||||||
# ---------- Install multi-gateway launcher ----------
|
|
||||||
# Launches one gateway process per profile (HERMES_PROFILES env var)
|
|
||||||
COPY --chmod=0755 run-multi-gateways.sh /usr/local/bin/run-multi-gateways.sh
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
USER hermes
|
USER hermes
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Multi-gateway launcher for HERMES_PROFILES env var.
|
|
||||||
# Reads comma-separated profile names, spawns one gateway per profile.
|
|
||||||
# Designed to run before the main entrypoint — gateways run in background.
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [ -z "${HERMES_PROFILES}" ]; then
|
|
||||||
echo "HERMES_PROFILES not set — skipping multi-gateway launch"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Source venv to make 'hermes' available (entrypoint.sh sources it later,
|
|
||||||
# but we need it NOW for the background gateways)
|
|
||||||
HERMES_BIN="/opt/hermes/.venv/bin/hermes"
|
|
||||||
if [ ! -x "$HERMES_BIN" ]; then
|
|
||||||
echo "ERROR: hermes binary not found at $HERMES_BIN"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p /opt/data/logs
|
|
||||||
|
|
||||||
IFS=',' read -ra PROFILES <<< "${HERMES_PROFILES}"
|
|
||||||
for profile in "${PROFILES[@]}"; do
|
|
||||||
profile="$(echo "${profile}" | xargs)" # trim whitespace
|
|
||||||
[ -z "${profile}" ] && continue
|
|
||||||
|
|
||||||
echo "Starting gateway for profile: ${profile}"
|
|
||||||
nohup env API_SERVER_ENABLED=false API_SERVER_KEY= gosu hermes "$HERMES_BIN" --profile "${profile}" gateway run \
|
|
||||||
>> "/opt/data/logs/gateway-${profile}.log" 2>&1 &
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "All gateways launched: ${HERMES_PROFILES}"
|
|
||||||
Reference in New Issue
Block a user