Update Dockerfile

Dockerfile

@@ -1,32 +1,56 @@
+# Specify the base Docker image 
 FROM ollama/ollama:latest
 
-# Create a user and set up permissions
-RUN useradd -ms /bin/bash ollama-user
+# Install Python 3 and its package manager
+RUN apt-get update && apt-get install -y python3 python3-pip
+
+# Create the user's home directory
+# RUN useradd -ms /bin/bash user
 
 # Set the home directory
-ENV HOME=/home/ollama-user
-WORKDIR $HOME
+# ENV HOME=/home/user
+# WORKDIR $HOME
+
+# Set the working directory inside the container
+WORKDIR /app
 
 # Ensure the user has access to the directory
-RUN mkdir -p $HOME/.ollama && chown -R ollama-user:ollama-user $HOME/.ollama
+RUN mkdir -p $HOME/.ollama && chown -R user:user $HOME/.ollama
 
 # Install netcat (nc) for checking server readiness
-RUN apt-get update && apt-get install -y netcat
+# RUN apt-get update && apt-get install -y netcat
 
 # Copy the entrypoint script before switching users
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+# COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # Set permissions for the entrypoint script
-RUN chmod +x /usr/local/bin/entrypoint.sh
+# RUN chmod +x /usr/local/bin/entrypoint.sh
 
 # Switch to the non-root user
-USER ollama-user
+USER user
 
 # Set Ollama to listen on all network interfaces
-ENV OLLAMA_HOST=0.0.0.0:7860
+# ENV OLLAMA_HOST=0.0.0.0:7860
 
 # Expose the default port
-EXPOSE 7860
+# EXPOSE 7860
+
+CMD ["ollama serve" & "ollama pull gemma3:4b" & "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
+
+# Wait for the server to be ready
+# while ! nc -z localhost 7860; do
+#     echo "Waiting for Ollama server to start..."
+#     sleep 1
+# done
+
+# Pull the model
+# echo "Pulling the model..."
+# ollama pull gemma3:4b
+
+# Keep the container running
+# wait
+
+# CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
 
-# Use the custom entrypoint script
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+# # Use the custom entrypoint script
+# ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]