5b6a67963a
Some checks failed
Release / semantic-release (push) Successful in 25s
tests / Unit tests (Linux, Python 3.11) (push) Failing after 5m17s
Release / build-linux (push) Failing after 7m8s
Release / build-windows (push) Has been cancelled
Release / build-macos (arm64, macos-latest) (push) Has been cancelled
Release / build-macos (x64, macos-15-intel) (push) Has been cancelled
Release / release-main (push) Has been cancelled
Release / release-develop (push) Has been cancelled
OAuth cannot be done interactively in the headless container, so the login
must be seeded into the mounted ~/.gemini. Three problems are fixed:
- Mount fragility on the Windows Docker Desktop target: the creds mount
defaulted to ${HOME}/.config/javis/gemini, but ${HOME} is often unset when
compose runs outside a WSL shell, silently mounting the wrong dir. Default is
now the project-local ./docker/gemini-oauth (cross-platform), GEMINI_OAUTH_DIR
still overrides.
- No visibility: when oauth is selected but no login is seeded, the path
silently degraded to DDG/Brave. Added gemini_oauth_ready() + a one-time debug
hint and a startup entrypoint warning (skipped on the browser role, fail-open).
- Seeding guidance: oauth_creds.json is the essential credential (refresh token;
GOOGLE_GENAI_USE_GCA=true forces OAuth), which is what the readiness check and
warning verify; docs recommend copying the whole ~/.gemini for convenience.
Adds docker/gemini-oauth/ seed dir (.gitkeep) with the login files gitignored,
GEMINI_OAUTH_DIR in .env.example, and updates DEPLOY.md, stream_browser_modes.md
and llm_contexts.md. Covered by 3 new tests (10 passed total).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
86 lines
3.9 KiB
Bash
Executable File
86 lines
3.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Container entrypoint: render config from env, set the VNC password, ensure the
|
|
# Piper voice exists, then hand off to supervisord (which runs the desktop,
|
|
# bridge, and bot).
|
|
set -euo pipefail
|
|
|
|
# --- Defaults (override via .env / compose) ---
|
|
: "${VNC_PASSWORD:=javis123}"
|
|
: "${VNC_RESOLUTION:=1920x1080}"
|
|
: "${OLLAMA_BASE_URL:=http://ollama:11434}"
|
|
: "${OLLAMA_CHAT_MODEL:=qwen3:8b}"
|
|
# Auxiliary small-model calls (intent judge, tool router, weather place
|
|
# extraction, query decomposition). The code default is gemma4:e2b, which this
|
|
# stack does not pull, so those calls would silently fail and fall open —
|
|
# crippling tool routing and arg extraction. Reuse the (already warm) chat model
|
|
# by default so everything runs on one resident model; override if you pull a
|
|
# dedicated small model.
|
|
: "${OLLAMA_INTENT_MODEL:=${OLLAMA_CHAT_MODEL}}"
|
|
: "${OLLAMA_EMBED_MODEL:=nomic-embed-text}"
|
|
: "${WHISPER_MODEL:=small}"
|
|
: "${WHISPER_DEVICE:=cuda}"
|
|
: "${WHISPER_COMPUTE_TYPE:=float16}"
|
|
: "${JARVIS_DB_PATH:=/data/jarvis.db}"
|
|
: "${BRIDGE_HOST:=127.0.0.1}"
|
|
: "${BRIDGE_PORT:=8765}"
|
|
: "${PIPER_VOICE:=en_GB-alan-medium}"
|
|
: "${PIPER_VOICE_DIR:=/opt/piper-voices}"
|
|
: "${TTS_PIPER_MODEL_PATH:=${PIPER_VOICE_DIR}/${PIPER_VOICE}.onnx}"
|
|
|
|
# Audio: shared PulseAudio socket so Chrome (playback) and the selfbot ffmpeg
|
|
# (capture of @DEFAULT_MONITOR@) reach the same headless daemon (run-pulse.sh).
|
|
: "${XDG_RUNTIME_DIR:=/run/user/0}"
|
|
: "${PULSE_SERVER:=unix:${XDG_RUNTIME_DIR}/pulse/native}"
|
|
|
|
export VNC_RESOLUTION OLLAMA_BASE_URL OLLAMA_CHAT_MODEL OLLAMA_INTENT_MODEL OLLAMA_EMBED_MODEL \
|
|
WHISPER_MODEL WHISPER_DEVICE WHISPER_COMPUTE_TYPE JARVIS_DB_PATH \
|
|
PIPER_VOICE PIPER_VOICE_DIR TTS_PIPER_MODEL_PATH BRIDGE_HOST BRIDGE_PORT \
|
|
XDG_RUNTIME_DIR PULSE_SERVER
|
|
|
|
mkdir -p /data /app/config "$(dirname "$JARVIS_DB_PATH")"
|
|
|
|
# --- VNC password file ---
|
|
mkdir -p /root/.vnc
|
|
echo "$VNC_PASSWORD" | tigervncpasswd -f > /root/.vnc/passwd
|
|
chmod 600 /root/.vnc/passwd
|
|
|
|
# --- Render jarvis brain config from template ---
|
|
envsubst < /app/docker/jarvis-config.template.json > /app/config/jarvis.json
|
|
export JARVIS_CONFIG_PATH=/app/config/jarvis.json
|
|
# Merge persistent settings from the settings UI (on the /data volume) on top of
|
|
# the env-rendered config, so changes survive container recreate.
|
|
if [ -f /data/jarvis-settings.json ]; then
|
|
python3 - <<'PY' || true
|
|
import json
|
|
try:
|
|
base = json.load(open("/app/config/jarvis.json"))
|
|
ov = json.load(open("/data/jarvis-settings.json"))
|
|
if isinstance(base, dict) and isinstance(ov, dict):
|
|
base.update(ov)
|
|
json.dump(base, open("/app/config/jarvis.json", "w"), ensure_ascii=False, indent=2)
|
|
print("[entrypoint] merged persistent settings overrides")
|
|
except Exception as e:
|
|
print(f"[entrypoint] settings merge skipped: {e}")
|
|
PY
|
|
fi
|
|
|
|
# --- Ensure the Piper voice exists (best effort) ---
|
|
bash /app/docker/download-piper.sh || echo "[entrypoint] piper download failed; TTS may be unavailable"
|
|
|
|
# --- Gemini OAuth login check (GEMINI_AUTH=oauth real-time search) ---
|
|
# The browser-only role never runs the reply engine / web search, so skip the
|
|
# check there. Otherwise warn (don't fail) when oauth is selected but no login
|
|
# has been seeded into the mounted ~/.gemini, since the path silently degrades
|
|
# to the DDG/Brave cascade.
|
|
if [ "${JARVIS_ROLE:-full}" != "browser" ] \
|
|
&& [ "${GEMINI_AUTH:-oauth}" = "oauth" ] \
|
|
&& [ ! -f /root/.gemini/oauth_creds.json ]; then
|
|
echo "[entrypoint] 🔑 GEMINI_AUTH=oauth but no Gemini login at /root/.gemini/oauth_creds.json"
|
|
echo "[entrypoint] Real-time search will fall back to DDG/Brave until you seed the login."
|
|
echo "[entrypoint] Seed it: copy a logged-in ~/.gemini into the host's gemini-oauth dir"
|
|
echo "[entrypoint] (default ./docker/gemini-oauth, or set GEMINI_OAUTH_DIR). See docs/DEPLOY.md."
|
|
fi
|
|
|
|
echo "[entrypoint] display=$DISPLAY ollama=$OLLAMA_BASE_URL whisper=$WHISPER_MODEL/$WHISPER_DEVICE"
|
|
exec supervisord -c /app/docker/supervisord.conf
|