Spaces:
Sleeping
Sleeping
Update Dockerfile
Browse files- Dockerfile +21 -28
Dockerfile
CHANGED
|
@@ -13,23 +13,20 @@ RUN apt-get update && apt-get install -y \
|
|
| 13 |
# Ollama 설치
|
| 14 |
RUN curl -fsSL https://ollama.com/install.sh | sh
|
| 15 |
|
| 16 |
-
#
|
|
|
|
|
|
|
| 17 |
ENV OLLAMA_MODEL=gemma2:9b
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
RUN mkdir -p /app/.ollama && chmod -R 777 /app/.ollama
|
| 21 |
|
| 22 |
# 빌드 중 모델 다운로드
|
| 23 |
RUN set -eux; \
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
sleep 1; \
|
| 30 |
-
done; \
|
| 31 |
-
ollama pull gemma2:9b; \
|
| 32 |
-
kill "$pid" || true
|
| 33 |
|
| 34 |
# 3. 작업 디렉터리 설정
|
| 35 |
WORKDIR /app
|
|
@@ -63,18 +60,14 @@ EXPOSE 11434
|
|
| 63 |
|
| 64 |
# 수정된 CMD
|
| 65 |
CMD bash -lc '\
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
echo "Ensuring model is available: $OLLAMA_MODEL"; \
|
| 78 |
-
ollama pull "$OLLAMA_MODEL" || { echo "Failed to pull model"; exit 1; }; \
|
| 79 |
-
echo "Starting Streamlit app"; \
|
| 80 |
-
streamlit run app.py --server.address=0.0.0.0 --server.port=${PORT:-8501}'
|
|
|
|
| 13 |
# Ollama 설치
|
| 14 |
RUN curl -fsSL https://ollama.com/install.sh | sh
|
| 15 |
|
| 16 |
+
# ✅ Ollama 저장소를 /tmp로 전역 고정 (권한 안전)
|
| 17 |
+
ENV OLLAMA_HOME=/tmp/ollama
|
| 18 |
+
ENV OLLAMA_MODELS=/tmp/ollama
|
| 19 |
ENV OLLAMA_MODEL=gemma2:9b
|
| 20 |
+
RUN mkdir -p /tmp/ollama && chmod -R 777 /tmp/ollama
|
| 21 |
+
|
|
|
|
| 22 |
|
| 23 |
# 빌드 중 모델 다운로드
|
| 24 |
RUN set -eux; \
|
| 25 |
+
mkdir -p /tmp/ollama && chmod -R 777 /tmp/ollama; \
|
| 26 |
+
env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama serve & pid=$!; \
|
| 27 |
+
for i in {1..120}; do curl -sf http://127.0.0.1:11434/api/version >/dev/null && break || sleep 1; done; \
|
| 28 |
+
env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama pull gemma2:9b; \
|
| 29 |
+
kill "$pid" || true
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
|
| 31 |
# 3. 작업 디렉터리 설정
|
| 32 |
WORKDIR /app
|
|
|
|
| 60 |
|
| 61 |
# 수정된 CMD
|
| 62 |
CMD bash -lc '\
|
| 63 |
+
set -euo pipefail; \
|
| 64 |
+
mkdir -p /tmp/ollama && chmod -R 777 /tmp/ollama; \
|
| 65 |
+
echo "Starting Ollama with model: ${OLLAMA_MODEL:-gemma2:9b}"; \
|
| 66 |
+
# ★ ollama 프로세스에만 HOME/OLLAMA_*를 /tmp로 강제 주입
|
| 67 |
+
env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama serve & \
|
| 68 |
+
# 레디체크
|
| 69 |
+
for i in {1..240}; do curl -sf http://127.0.0.1:11434/api/version >/dev/null && break || sleep 1; done; \
|
| 70 |
+
# 모델 풀 (고정: gemma2:9b)
|
| 71 |
+
env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama pull "${OLLAMA_MODEL:-gemma2:9b}" || { echo "[ERR] ollama pull failed"; exit 1; }; \
|
| 72 |
+
# Streamlit 실행 (여긴 HOME=/app 그대로)
|
| 73 |
+
exec streamlit run "app.py" --server.address=0.0.0.0 --server.port=${PORT:-8501}'
|
|
|
|
|
|
|
|
|
|
|
|