kshitijthakkar
commited on
Commit
Β·
f3a5899
1
Parent(s):
9b0d43d
updated to use ollama locally
Browse files- Dockerfile +11 -11
- entrypoint.sh +3 -3
Dockerfile
CHANGED
|
@@ -21,21 +21,21 @@ USER appuser
|
|
| 21 |
WORKDIR /app
|
| 22 |
|
| 23 |
# Install Ollama CLI
|
| 24 |
-
RUN mkdir -p /
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
cp /tmp/ollama
|
| 30 |
-
chmod +x ~/.local/bin/ollama && \
|
| 31 |
-
rm -rf /tmp/ollama
|
| 32 |
-
|
| 33 |
ENV PATH="/home/appuser/.local/bin:$PATH"
|
| 34 |
|
| 35 |
# Copy app
|
| 36 |
COPY --chown=appuser:appuser . /app
|
| 37 |
-
|
| 38 |
# Install Python dependencies
|
|
|
|
| 39 |
RUN pip install --no-cache-dir --upgrade pip && \
|
| 40 |
pip install --no-cache-dir -r requirements.txt
|
| 41 |
|
|
@@ -46,4 +46,4 @@ EXPOSE 7860
|
|
| 46 |
COPY --chown=appuser:appuser entrypoint.sh /app/entrypoint.sh
|
| 47 |
RUN chmod +x /app/entrypoint.sh
|
| 48 |
|
| 49 |
-
CMD ["/app/entrypoint.sh"]
|
|
|
|
| 21 |
WORKDIR /app
|
| 22 |
|
| 23 |
# Install Ollama CLI
|
| 24 |
+
#RUN mkdir -p ~/.local/bin && \
|
| 25 |
+
# curl -fL --retry 5 --retry-delay 5 \
|
| 26 |
+
# -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64)" \
|
| 27 |
+
# https://ollama.com/download/ollama-linux-amd64.tgz \
|
| 28 |
+
# | tar -xvz --no-same-owner --no-same-permissions -C /tmp && \
|
| 29 |
+
# cp /tmp/ollama/bin/ollama ~/.local/bin/ollama && \
|
| 30 |
+
# chmod +x ~/.local/bin/ollama && \
|
| 31 |
+
# rm -rf /tmp/ollama
|
|
|
|
| 32 |
ENV PATH="/home/appuser/.local/bin:$PATH"
|
| 33 |
|
| 34 |
# Copy app
|
| 35 |
COPY --chown=appuser:appuser . /app
|
| 36 |
+
#RUN mv /app/ollama /home/appuser/.local/bin/
|
| 37 |
# Install Python dependencies
|
| 38 |
+
RUN ls -ltr && pwd
|
| 39 |
RUN pip install --no-cache-dir --upgrade pip && \
|
| 40 |
pip install --no-cache-dir -r requirements.txt
|
| 41 |
|
|
|
|
| 46 |
COPY --chown=appuser:appuser entrypoint.sh /app/entrypoint.sh
|
| 47 |
RUN chmod +x /app/entrypoint.sh
|
| 48 |
|
| 49 |
+
CMD ["/app/entrypoint.sh"]
|
entrypoint.sh
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
set -e
|
| 5 |
|
| 6 |
echo "πΉ Starting Ollama server in background..."
|
| 7 |
-
OLLAMA_HOST=0.0.0.0:11434 ollama serve &
|
| 8 |
OLLAMA_PID=$!
|
| 9 |
|
| 10 |
# Wait until Ollama API is responsive
|
|
@@ -18,11 +18,11 @@ echo "π’ Ollama is live!"
|
|
| 18 |
# Pull your lightweight model
|
| 19 |
MODEL_NAME="hf.co/kshitijthakkar/loggenix-moe-0.3B-A0.1B-e3-lr7e5-b16-4090-v6.3-finetuned-tool-Q8_0-GGUF:Q8_0"
|
| 20 |
echo "π½ Pulling model: $MODEL_NAME"
|
| 21 |
-
ollama pull "$MODEL_NAME" || {
|
| 22 |
echo "β Failed to pull model. Check name and internet."
|
| 23 |
exit 1
|
| 24 |
}
|
| 25 |
|
| 26 |
# Start your app
|
| 27 |
echo "π Launching enhanced_app.py"
|
| 28 |
-
exec python /app/enhanced_app.py
|
|
|
|
| 4 |
set -e
|
| 5 |
|
| 6 |
echo "πΉ Starting Ollama server in background..."
|
| 7 |
+
OLLAMA_HOST=0.0.0.0:11434 /app/ollama serve &
|
| 8 |
OLLAMA_PID=$!
|
| 9 |
|
| 10 |
# Wait until Ollama API is responsive
|
|
|
|
| 18 |
# Pull your lightweight model
|
| 19 |
MODEL_NAME="hf.co/kshitijthakkar/loggenix-moe-0.3B-A0.1B-e3-lr7e5-b16-4090-v6.3-finetuned-tool-Q8_0-GGUF:Q8_0"
|
| 20 |
echo "π½ Pulling model: $MODEL_NAME"
|
| 21 |
+
/app/ollama pull "$MODEL_NAME" || {
|
| 22 |
echo "β Failed to pull model. Check name and internet."
|
| 23 |
exit 1
|
| 24 |
}
|
| 25 |
|
| 26 |
# Start your app
|
| 27 |
echo "π Launching enhanced_app.py"
|
| 28 |
+
exec python /app/enhanced_app.py
|