Deploy: GitHub submodule sync 2026-07-27 22:08:13

server-dev/docker-compose.rag.server.yml

@@ -34,7 +34,8 @@ services:
       LLM_BASE_URL: http://host.docker.internal:16000
       TEI_EMBED_URL: http://host.docker.internal:16001
       TEI_RERANK_URL: http://host.docker.internal:16002
-      # exdev: 호스트에서 기동한 chatbotApi(WAS). 운영 기본값(172.16.180.130)은 git push 대상 코드에만 유지.
+      # exdev: 호스트 chatbotApi. 운영 IP(172.16.180.130)는 git_fetch_all 커밋 기본값에만 유지.
+      EXDEV_LOCAL: ${EXDEV_LOCAL:-true}
       CHATBOT_API_BASE_URL: ${CHATBOT_API_BASE_URL:-http://host.docker.internal:8086/api}
       INTERNAL_TOOL_API_KEY: ${INTERNAL_TOOL_API_KEY:-exdev-agent-tool-key}
       CHATBOT_TOOL_TIMEOUT: ${CHATBOT_TOOL_TIMEOUT:-60}

server-dev/env.exdev-server.template

@@ -32,8 +32,11 @@ QDRANT_PORT=6333
 QDRANT_COLLECTION=qa_vectors_v2
 
 # ── Agent / WAS (Docker → 호스트 chatbotApi) ──
+# EXDEV_LOCAL=true 이면 운영 WAS(172.16.180.130) 호출을 차단한다.
+# (GitHub push 시 git_fetch_all.sh 가 커밋 파일의 운영 기본 주소를 복원한다.)
 AGENT_MODE=agent
 AGENT_MAX_ROUNDS=6
+EXDEV_LOCAL=true
 CHATBOT_API_BASE_URL=http://host.docker.internal:8086/api
 INTERNAL_TOOL_API_KEY=exdev-agent-tool-key
 CHATBOT_TOOL_TIMEOUT=60

server-dev/start-all-server.sh

@@ -358,10 +358,15 @@ ensure_rag_env() {
   fi
 
   # RAG(Docker) → 호스트 chatbotApi (exdev 로컬 WAS). 운영 IP(172.16.180.130) 사용 금지.
+  # GitHub 커밋 기본값은 운영 IP 유지 — git_fetch_all.sh 가 push 전 복원.
+  patch_env "EXDEV_LOCAL" "true"
   patch_env "CHATBOT_API_BASE_URL" "http://host.docker.internal:${WAS_PORT}/api"
   patch_env "INTERNAL_TOOL_API_KEY" "${INTERNAL_TOOL_API_KEY}"
   patch_env "CHATBOT_TOOL_TIMEOUT" "60"
-  log "RAG .env WAS: host.docker.internal:${WAS_PORT} (로컬 chatbotApi)"
+  if grep -qE 'CHATBOT_API_BASE_URL=.*172\.16\.180\.130' "${RAG_ENV}" 2>/dev/null; then
+    fail "exdev RAG .env 에 운영 WAS(172.16.180.130) 가 남아 있습니다"
+  fi
+  log "RAG .env WAS: host.docker.internal:${WAS_PORT} (로컬 chatbotApi, EXDEV_LOCAL=true)"
 }
 
 ensure_mongo() {
@@ -412,6 +417,7 @@ start_rag() {
   ensure_rag_compose
   [[ -f "${COMPOSE_SERVER}" ]] || fail "docker-compose.server.yml 없음"
   # compose environment 보간 + 컨테이너 env (로컬 WAS)
+  export EXDEV_LOCAL=true
   export CHATBOT_API_BASE_URL="http://host.docker.internal:${WAS_PORT}/api"
   export INTERNAL_TOOL_API_KEY="${INTERNAL_TOOL_API_KEY}"
   export CHATBOT_TOOL_TIMEOUT="${CHATBOT_TOOL_TIMEOUT:-60}"
@@ -420,7 +426,7 @@ start_rag() {
   local -a up_flags=(-d)
   if $NO_BUILD; then up_flags+=(--no-build); else up_flags+=(--build); fi
   log "RAG 스택 기동 (docker-compose.server.yml)..."
-  log "  CHATBOT_API_BASE_URL=${CHATBOT_API_BASE_URL}"
+  log "  EXDEV_LOCAL=${EXDEV_LOCAL} CHATBOT_API_BASE_URL=${CHATBOT_API_BASE_URL}"
   docker compose -f "${COMPOSE_SERVER}" up "${up_flags[@]}"
   wait_http "http://127.0.0.1:6333/collections" "Qdrant" 30 || true
   bootstrap_qdrant_if_empty
@@ -522,6 +528,13 @@ verify_stack() {
   wait_port "${WAS_PORT}" "chatbotApi" 5 || ok=false
   wait_port "${SKILL_PORT}" "kakaoChatbotSkill" 5 || ok=false
   curl -sf "http://127.0.0.1:${APP_PORT}/chatbot/ai/" | grep -q 'data-chatbot-app="ai-mode"' || { log "❌ chatbotApp UI"; ok=false; }
+  # exdev 는 운영 WAS IP 를 절대 참조하지 않아야 한다
+  local rag_was
+  rag_was="$(docker exec exaichatbot-agent-api-1 printenv CHATBOT_API_BASE_URL 2>/dev/null || true)"
+  if [[ "${rag_was}" == *172.16.180.130* ]]; then
+    log "❌ RAG 가 운영 WAS(172.16.180.130) 를 참조 중: ${rag_was}"
+    ok=false
+  fi
   if $ok; then log "✅ 전체 스택 정상"; return 0; fi
   log "⚠️  일부 서비스 미응답 — ${LOG_DIR}/ 확인"
   return 1
@@ -564,6 +577,7 @@ if ! $SKIP_JAVA; then
 
   start_java_service "kakaoChatbotSkill" "${SKILL_DIR}" \
     "${RUN_DIR}/kakao-skill.pid" "${LOG_DIR}/kakao-skill.log" \
+    "EXDEV_LOCAL=true" \
     "AGENT_MODE=agent" \
     "RAG_AGENT_CHAT_URL=http://127.0.0.1:${RAG_PORT}/agent/chat" \
     "CHATBOT_API_BASE_URL=http://127.0.0.1:${WAS_PORT}/api/" \