code-slicer commited on
Commit
7f288e2
ยท
verified ยท
1 Parent(s): 5d942ff

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +13 -20
Dockerfile CHANGED
@@ -13,19 +13,17 @@ RUN apt-get update && apt-get install -y \
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. ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ ์„ค์ •
@@ -44,7 +42,7 @@ RUN git lfs install && git lfs pull || true
44
  # ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์„ค์ •
45
  ENV HOME=/app
46
  ENV STREAMLIT_HOME=/app/.streamlit
47
- RUN mkdir -p /app/.streamlit && chmod -R 777 /app/.streamlit
48
 
49
  ENV HF_HOME=/tmp/hf-home \
50
  TRANSFORMERS_CACHE=/tmp/hf-cache \
@@ -56,18 +54,13 @@ RUN mkdir -p /tmp/hf-home /tmp/hf-cache /tmp/torch-cache /tmp/xdg-cache
56
 
57
  ENV OLLAMA_HOST=http://127.0.0.1:11434
58
  EXPOSE 8501
59
- EXPOSE 11434
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}'
 
13
  # Ollama ์„ค์น˜
14
  RUN curl -fsSL https://ollama.com/install.sh | sh
15
 
16
+ # โœ… ์ž‘์€ ๋ชจ๋ธ + ๊ถŒํ•œ ๋ฌธ์ œ ์—†๋Š” ์„ค์ •
17
  ENV OLLAMA_HOME=/tmp/ollama
18
  ENV OLLAMA_MODELS=/tmp/ollama
19
  ENV OLLAMA_MODEL=gemma2:9b
 
20
 
21
+ # ๋นŒ๋“œ ์ค‘ ๋ชจ๋ธ ๋‹ค์šด๋กœ๋“œ (์ž‘์€ ๋ชจ๋ธ์ด๋ผ ๋น ๋ฆ„)
 
22
  RUN set -eux; \
23
+ mkdir -p /tmp/ollama; \
24
  env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama serve & pid=$!; \
25
+ for i in {1..60}; do curl -sf http://127.0.0.1:11434/api/version >/dev/null && break || sleep 1; done; \
26
+ env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama pull gemma2:2b; \
27
  kill "$pid" || true
28
 
29
  # 3. ์ž‘์—… ๋””๋ ‰ํ„ฐ๋ฆฌ ์„ค์ •
 
42
  # ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์„ค์ •
43
  ENV HOME=/app
44
  ENV STREAMLIT_HOME=/app/.streamlit
45
+ RUN mkdir -p /app/.streamlit
46
 
47
  ENV HF_HOME=/tmp/hf-home \
48
  TRANSFORMERS_CACHE=/tmp/hf-cache \
 
54
 
55
  ENV OLLAMA_HOST=http://127.0.0.1:11434
56
  EXPOSE 8501
 
57
 
58
+ # โœ… ๊ฐ„๋‹จํ•˜๊ณ  ํ™•์‹คํ•œ CMD
59
  CMD bash -lc '\
60
+ mkdir -p /tmp/ollama; \
61
+ echo "Starting Ollama with model: gemma2:9b"; \
 
 
62
  env HOME=/tmp OLLAMA_HOME=/tmp/ollama OLLAMA_MODELS=/tmp/ollama ollama serve & \
63
+ sleep 10; \
64
+ echo "Ollama server should be ready"; \
65
+ echo "Starting Streamlit app"; \
66
+ streamlit run app.py --server.address=0.0.0.0 --server.port=${PORT:-8501}'