From 456c0319550211f3d4604e82623ea2e7f19278cf Mon Sep 17 00:00:00 2001
From: ogt <owen.tsai@gmail.com>
Date: Mon, 20 Apr 2026 06:19:44 +0800
Subject: [PATCH] fix: remove defunct momo-telegram-bot from all CD/compose
 references

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)
---
 .gitea/workflows/cd.yaml |  8 ++++----
 docker-compose.yml       | 39 +--------------------------------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index 9f6551c..d582de7 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -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 Image（Dockerfile / requirements.txt 變動） ──
       - name: 同步所有檔案並重建 Image
@@ -152,9 +152,9 @@ jobs:
             --exclude='.env' \
             --exclude='*.db' \
             ./ ollama@192.168.0.188:/home/ollama/momo-pro/
-          # 重建並重啟（三容器共用同一 image，rebuild 後都需重建）
+          # 重建並重啟（兩容器共用同一 image，telegram-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: 健康檢查
diff --git a/docker-compose.yml b/docker-compose.yml
index f358706..a6a5c66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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 - 指標收集與儲存
   # ---------------------------------------------------------------------------