Update Dockerfile

Dockerfile

@@ -1,43 +1,80 @@
+# 1. 파이썬 버전을 3.11으로 설정
 FROM python:3.11-slim
 
-# base deps
-RUN pip install --no-cache-dir hf_transfer>=0.1.6 && \
-    apt-get update && apt-get install -y build-essential curl git git-lfs && \
-    rm -rf /var/lib/apt/lists/*
+# 2. 필요한 시스템 패키지 및 git-lfs 설치
+RUN pip install --no-cache-dir hf_transfer>=0.1.6
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    curl \
+    git \
+    git-lfs \
+    && rm -rf /var/lib/apt/lists/*
 
 # Ollama 설치
 RUN curl -fsSL https://ollama.com/install.sh | sh
 
-# 앱 설치
+# 환경변수 설정 (명시적으로 모델명 지정)
+ENV OLLAMA_MODEL=gemma2:9b
+ENV OLLAMA_HOME=/app/.ollama
+ENV OLLAMA_MODELS=/app/.ollama
+RUN mkdir -p /app/.ollama && chmod -R 777 /app/.ollama
+
+# 빌드 중 모델 다운로드
+RUN set -eux; \
+    ollama serve & pid=$!; \
+    i=0; \
+    until curl -fsS http://127.0.0.1:11434/api/tags >/dev/null 2>&1; do \
+      i=$((i+1)); \
+      [ "$i" -lt 60 ] || { echo "Ollama not ready"; kill "$pid"; exit 1; }; \
+      sleep 1; \
+    done; \
+    ollama pull gemma2:9b; \
+    kill "$pid" || true
+
+# 3. 작업 디렉터리 설정
 WORKDIR /app
+
+# 6. 파이썬 라이브러리 설치
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
+
+# 4. 소스 코드 복사
 COPY . /app
+
+# 5. Git LFS 설정 및 대용량 파일 다운로드
 RUN git lfs install && git lfs pull || true
 
-# Streamlit 폴더 권한
+# 환경변수 설정
 ENV HOME=/app
+ENV STREAMLIT_HOME=/app/.streamlit
 RUN mkdir -p /app/.streamlit && chmod -R 777 /app/.streamlit
 
-# ✅ Ollama 저장소를 /tmp로 고정(Spaces에서 안전)
-ENV OLLAMA_HOME=/tmp/ollama
-ENV OLLAMA_MODELS=/tmp/ollama
-RUN mkdir -p /tmp/ollama && chmod -R 777 /tmp/ollama
+ENV HF_HOME=/tmp/hf-home \
+    TRANSFORMERS_CACHE=/tmp/hf-cache \
+    HUGGINGFACE_HUB_CACHE=/tmp/hf-cache \
+    TORCH_HOME=/tmp/torch-cache \
+    XDG_CACHE_HOME=/tmp/xdg-cache
 
-# ✅ 런타임 설정 (모델 고정 + 타임아웃 여유)
-ENV OLLAMA_HOST=http://127.0.0.1:11434
-ENV OLLAMA_MODEL=gemma2:9b
-ENV OLLAMA_TIMEOUT=300
+RUN mkdir -p /tmp/hf-home /tmp/hf-cache /tmp/torch-cache /tmp/xdg-cache
 
+ENV OLLAMA_HOST=http://127.0.0.1:11434
 EXPOSE 8501
+EXPOSE 11434
 
-# ✅ 실행: serve → 헬스체크 → gemma2:9b pull → Streamlit
-
+# 수정된 CMD
 CMD bash -lc '\
-  set -e; \
-  export OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama; \
-  echo "Starting Ollama with model: ${OLLAMA_MODEL}"; \
+  export OLLAMA_MODEL=${OLLAMA_MODEL:-gemma2:9b}; \
+  echo "Starting Ollama with model: $OLLAMA_MODEL"; \
   ollama serve & \
-  for i in {1..240}; do curl -sf http://127.0.0.1:11434/api/version >/dev/null && break || sleep 1; done; \
-  ollama pull "${OLLAMA_MODEL}" || { echo "[ERR] ollama pull failed"; exit 1; }; \
-  exec streamlit run "app (15).py" --server.address=0.0.0.0 --server.port=${PORT:-8501}'
+  for i in {1..120}; do \
+    if curl -fsS http://127.0.0.1:11434/api/version >/dev/null 2>&1; then \
+      echo "Ollama server is ready"; \
+      break; \
+    fi; \
+    echo "Waiting for Ollama... ($i/120)"; \
+    sleep 1; \
+  done; \
+  echo "Ensuring model is available: $OLLAMA_MODEL"; \
+  ollama pull "$OLLAMA_MODEL" || { echo "Failed to pull model"; exit 1; }; \
+  echo "Starting Streamlit app"; \
+  streamlit run app.py --server.address=0.0.0.0 --server.port=${PORT:-8501}'