25c77ac794
Some checks failed
Release / semantic-release (push) Successful in 22s
tests / Unit tests (Linux, Python 3.11) (push) Successful in 9m55s
Release / build-linux (push) Failing after 7m36s
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
`docker compose up -d --build` now brings up the whole thing automatically — no host setup needed: - All-in-one javis image: TigerVNC+XFCE desktop, Chrome, Python brain bridge, Node/bun bot, managed by supervisord (verified: all 6 programs RUNNING). - ollama service + one-shot ollama-init that auto-pulls chat+embed models (verified end-to-end; `ollama list` shows pulled models). - Discord token deferred: without DISCORD_BOT_TOKEN the desktop, bridge, Ollama and models all run; only the bot waits (no crash loop). - Slim container deps (bridge/requirements-bridge.txt) drop the unused PyQt6/torch/chatterbox/sounddevice stack. Piper voice + Whisper models auto-download into named volumes. - Configurable host ports (VNC_PORT/NOVNC_PORT/BRIDGE_PORT) to avoid clashing with a host VNC already on 5901. Bridge binds 0.0.0.0 in-container. Verified: image builds; brain imports; bridge /health 200; noVNC 200; X display :1 @1920x1080; auto-pull completes; supervisorctl status all RUNNING.
23 lines
867 B
Bash
Executable File
23 lines
867 B
Bash
Executable File
#!/usr/bin/env bash
|
|
# Wait for the brain bridge, then run the Discord bot.
|
|
#
|
|
# The Discord token is intentionally deferred: if DISCORD_BOT_TOKEN is not set
|
|
# yet, the rest of the stack (desktop, bridge, ollama) still runs fully. The bot
|
|
# just waits. Add the token to .env and `docker compose up -d` to start it.
|
|
set -e
|
|
cd /app/bot
|
|
|
|
if [ -z "${DISCORD_BOT_TOKEN:-}" ]; then
|
|
echo "[bot] DISCORD_BOT_TOKEN 미설정 — 봇 대기 중. .env에 토큰을 넣고 'docker compose up -d' 하면 시작됩니다."
|
|
echo "[bot] (그동안 VNC 데스크톱 / 브릿지 / Ollama 는 정상 동작합니다.)"
|
|
exec sleep infinity
|
|
fi
|
|
|
|
BRIDGE="${BRIDGE_URL:-http://127.0.0.1:8765}"
|
|
for i in $(seq 1 60); do
|
|
curl -fsS "$BRIDGE/health" >/dev/null 2>&1 && break
|
|
sleep 1
|
|
done
|
|
bun run register || echo "[bot] slash command registration failed (continuing)"
|
|
exec bun run start
|