fix: remove defunct momo-telegram-bot from all CD/compose references
Some checks failed
CD Pipeline / deploy (push) Failing after 1m20s

CD was failing with 'No such container: momo-telegram-bot' because
the Gitea Actions restart step still listed all three containers.

Changes:
1. .gitea/workflows/cd.yaml:
   - Sync mode: docker restart now only targets momo-pro-system momo-scheduler
   - Rebuild mode: docker compose up no longer includes telegram-bot service

2. docker-compose.yml:
   - Removed telegram-bot service block (38 lines)
   - Syncs local repo with remote server state (already removed there)
This commit is contained in:
ogt
2026-04-20 06:19:44 +08:00
parent e0d3b54527
commit 456c031955
2 changed files with 5 additions and 42 deletions

View File

@@ -130,8 +130,8 @@ jobs:
if: steps.deploy_type.outputs.type == 'sync'
run: |
ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no ollama@192.168.0.188 \
"docker restart momo-pro-system momo-scheduler momo-telegram-bot 2>&1 && \
echo '✅ 容器已重啟app/scheduler/telegram-bot'"
"docker restart momo-pro-system momo-scheduler 2>&1 && \
echo '✅ 容器已重啟app/scheduler'
# ── 模式 B重建 Docker ImageDockerfile / requirements.txt 變動) ──
- name: 同步所有檔案並重建 Image
@@ -152,9 +152,9 @@ jobs:
--exclude='.env' \
--exclude='*.db' \
./ ollama@192.168.0.188:/home/ollama/momo-pro/
# 重建並重啟(容器共用同一 imagerebuild 後都需重建
# 重建並重啟(容器共用同一 imagetelegram-bot 已於 2026-04-20 移除
ssh -i ~/.ssh/id_deploy -o StrictHostKeyChecking=no ollama@192.168.0.188 \
"cd /home/ollama/momo-pro && docker compose build momo-app && docker compose up -d --no-deps --force-recreate momo-app scheduler telegram-bot && echo '✅ Image 重建完成'"
"cd /home/ollama/momo-pro && docker compose build momo-app && docker compose up -d --no-deps --force-recreate momo-app scheduler && echo '✅ Image 重建完成'"
# ── 健康檢查(最多重試 5 次,每次間隔 10s ───────────────────────────
- name: 健康檢查

View File

@@ -247,48 +247,11 @@ services:
max-size: "10m"
max-file: "3"
# ---------------------------------------------------------------------------
# Telegram Bot - 趨勢查詢與推播服務
# 啟動: docker-compose up -d telegram-bot
# ---------------------------------------------------------------------------
telegram-bot:
build:
context: .
dockerfile: Dockerfile
image: ${MOMO_IMAGE:-registry.wooo.work/wooo/momo-pro-system}:${VERSION:-latest}
container_name: momo-telegram-bot
restart: unless-stopped
labels:
- "com.centurylinklabs.watchtower.enable=true"
init: true
volumes:
- ./data:/app/data
- ./logs:/app/logs
- ./config.py:/app/config.py:ro
- ./run_telegram_bot.py:/app/run_telegram_bot.py:ro
- ./services:/app/services:ro
- ./database:/app/database:ro
environment:
- FLASK_ENV=production
- PYTHONUNBUFFERED=1
- TZ=Asia/Taipei
env_file:
- .env
command: ["python", "run_telegram_bot.py"]
depends_on:
- momo-app
networks:
- momo-network
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"
# ===========================================================================
# Monitoring Services (使用 --profile monitoring 啟用)
# ===========================================================================
# ---------------------------------------------------------------------------
# Prometheus - 指標收集與儲存
# ---------------------------------------------------------------------------