Update Dockerfile
Browse files- Dockerfile +7 -6
Dockerfile
CHANGED
|
@@ -3,23 +3,24 @@ FROM ollama/ollama:latest
|
|
| 3 |
ARG OLLAMA_MODEL=hermes3
|
| 4 |
ARG OLLAMA_MODEL_TAG=latest
|
| 5 |
|
| 6 |
-
#
|
| 7 |
-
|
| 8 |
|
| 9 |
-
#
|
|
|
|
| 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"]
|
|
|
|
| 3 |
ARG OLLAMA_MODEL=hermes3
|
| 4 |
ARG OLLAMA_MODEL_TAG=latest
|
| 5 |
|
| 6 |
+
# Переопределяем ENTRYPOINT!
|
| 7 |
+
ENTRYPOINT []
|
| 8 |
|
| 9 |
+
# Настройка для HF Spaces
|
| 10 |
+
EXPOSE 7860
|
| 11 |
ENV OLLAMA_HOST=0.0.0.0:7860
|
| 12 |
|
| 13 |
# Создаем startup скрипт
|
| 14 |
RUN echo '#!/bin/sh\n\
|
| 15 |
set -e\n\
|
| 16 |
echo "Starting Ollama server..."\n\
|
| 17 |
+
/bin/ollama serve &\n\
|
| 18 |
SERVER_PID=$!\n\
|
|
|
|
| 19 |
sleep 10\n\
|
| 20 |
echo "Pulling model..."\n\
|
| 21 |
+
/bin/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 будет работать правильно
|
| 26 |
CMD ["/bin/sh", "/start.sh"]
|