Update Dockerfile

Dockerfile

@@ -1,4 +1,4 @@
-# Download base image ubuntu 18.04
+# Base image: Start with Ubuntu 18.04
 FROM ubuntu:18.04
 
 # Set environment variables
@@ -6,8 +6,10 @@ ENV NB_USER jovyan
 ENV NB_UID 1000
 ENV HOME /home/${NB_USER}
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+ENV PYSPARK_PYTHON=/usr/bin/python3.8
+ENV PYSPARK_DRIVER_PYTHON=/usr/bin/python3.8
 
-# Install required packages
+# Install required packages and dependencies
 RUN apt-get update && apt-get install -y \
     tar \
     wget \
@@ -28,6 +30,8 @@ RUN apt-get update && apt-get install -y \
     openjdk-8-jdk \
     ant \
     ca-certificates-java \
+    curl \
+    git \
     && apt-get clean \
     && update-ca-certificates -f
 
@@ -40,6 +44,10 @@ RUN add-apt-repository ppa:deadsnakes/ppa \
 # Set up JAVA_HOME
 RUN echo "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/" >> /etc/profile \
     && echo "export PATH=\$JAVA_HOME/bin:\$PATH" >> /etc/profile
+
+# Install Nvidia Container Toolkit for GPU support (if necessary for Ollama)
+RUN apt-get install -y nvidia-container-toolkit && apt-get clean
+
 # Create a new user named "jovyan" with user ID 1000
 RUN useradd -m -u ${NB_UID} ${NB_USER}
 
@@ -50,23 +58,28 @@ USER ${NB_USER}
 ENV HOME=/home/${NB_USER} \
     PATH=/home/${NB_USER}/.local/bin:$PATH
 
-# Set up PySpark to use Python 3.8 for both driver and workers
-ENV PYSPARK_PYTHON=/usr/bin/python3.8
-ENV PYSPARK_DRIVER_PYTHON=/usr/bin/python3.8
-
-# Set the working directory to the user's home directory
-WORKDIR ${HOME}
-
 # Upgrade pip and install Python dependencies
 RUN python3.8 -m pip install --upgrade pip
+
+# Copy the Python requirements file and install dependencies
 COPY requirements.txt /tmp/requirements.txt
 RUN python3.8 -m pip install -r /tmp/requirements.txt
 
-# Copy the application code into the container at /home/jovyan
-COPY --chown=${NB_USER}:${NB_USER} . ${HOME}
+# Download and set up Ollama CLI
+USER root
+RUN curl -fsSL https://ollama.com/download.sh | bash
+
+# Switch back to the "jovyan" user
+USER ${NB_USER}
 
-# Expose port for Streamlit
-EXPOSE 7860
+# Set working directory to the user's home directory
+WORKDIR ${HOME}
+
+# Expose ports for Streamlit and Ollama
+EXPOSE 7860 11434
+
+# Copy application code into the container
+COPY --chown=${NB_USER}:${NB_USER} . ${HOME}
 
-# Define the entry point for the container
-ENTRYPOINT ["streamlit", "run", "Demo.py", "--server.port=7860", "--server.address=0.0.0.0"]
+# Start Streamlit and Ollama server
+CMD ["bash", "-c", "streamlit run Demo.py --server.port=7860 --server.address=0.0.0.0 & ollama serve --port 11434"]