Update Dockerfile
Browse files- Dockerfile +18 -22
Dockerfile
CHANGED
|
@@ -1,29 +1,25 @@
|
|
| 1 |
-
FROM
|
| 2 |
-
|
| 3 |
-
# Установка Ollama вручную
|
| 4 |
-
RUN apt-get update && apt-get install -y \
|
| 5 |
-
curl \
|
| 6 |
-
&& curl -fsSL https://ollama.ai/install.sh | sh \
|
| 7 |
-
&& apt-get clean \
|
| 8 |
-
&& rm -rf /var/lib/apt/lists/*
|
| 9 |
|
| 10 |
ARG OLLAMA_MODEL=hermes3
|
|
|
|
| 11 |
|
| 12 |
-
# HF Spaces
|
| 13 |
EXPOSE 7860
|
| 14 |
-
ENV HOME=/home/user
|
| 15 |
-
ENV PATH=/usr/local/bin:$PATH
|
| 16 |
|
| 17 |
-
#
|
| 18 |
-
|
| 19 |
-
USER user
|
| 20 |
-
WORKDIR $HOME
|
| 21 |
|
| 22 |
-
#
|
| 23 |
-
RUN echo '#!/bin/
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
ollama
|
| 27 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
|
| 29 |
-
CMD ["
|
|
|
|
| 1 |
+
FROM ollama/ollama:latest
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
|
| 3 |
ARG OLLAMA_MODEL=hermes3
|
| 4 |
+
ARG OLLAMA_MODEL_TAG=latest
|
| 5 |
|
| 6 |
+
# HF Spaces требует порт 7860
|
| 7 |
EXPOSE 7860
|
|
|
|
|
|
|
| 8 |
|
| 9 |
+
# Ollama по умолчанию слушает на 0.0.0.0:11434
|
| 10 |
+
ENV OLLAMA_HOST=0.0.0.0:7860
|
|
|
|
|
|
|
| 11 |
|
| 12 |
+
# Создаем startup скрипт
|
| 13 |
+
RUN echo '#!/bin/sh\n\
|
| 14 |
+
set -e\n\
|
| 15 |
+
echo "Starting Ollama server..."\n\
|
| 16 |
+
ollama serve &\n\
|
| 17 |
+
SERVER_PID=$!\n\
|
| 18 |
+
echo "Waiting for server to start..."\n\
|
| 19 |
+
sleep 10\n\
|
| 20 |
+
echo "Pulling model..."\n\
|
| 21 |
+
ollama pull '${OLLAMA_MODEL}:${OLLAMA_MODEL_TAG}'\n\
|
| 22 |
+
echo "Model ready!"\n\
|
| 23 |
+
wait $SERVER_PID' > /start.sh && chmod +x /start.sh
|
| 24 |
|
| 25 |
+
CMD ["/bin/sh", "/start.sh"]
|