Update Dockerfile

Dockerfile

@@ -13,26 +13,28 @@ RUN apt-get update && \
     apt-get install -y unzip && \
     apt-get install -y git && \
     git clone https://github.com/lydianish/RoLASER.git /app/RoLASER
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # Clone the RoLASER repository into the container
 WORKDIR /app/RoLASER
 
 # Create conda environment with the required Python and GCC versions
 COPY --chown=user environment.yml /app/RoLASER/environment.yml
-RUN conda env create -f environment.yml
-RUN echo "conda activate rolaser_env" >> ~/.bashrc
+RUN conda env create -f environment.yml \
+&& echo "conda activate rolaser_env" >> ~/.bashrc
 ENV PATH /opt/conda/envs/rolaser_env/bin:$PATH
 
 # Install PyTorch 1.10.1
 RUN pip3 install --no-cache-dir torch==1.10.1 torchvision==0.11.2 torchaudio==0.10.1 -f https://download.pytorch.org/whl/cu102/torch_stable.html
 
 # Install Fairseq and dependencies
-RUN git clone https://github.com/lydianish/fairseq.git /app/fairseq \
-&& cd /app/fairseq \
-&& git checkout rolaser \
-&& pip3 install --no-cache-dir --editable . \
-&& python3 setup.py build_ext --inplace \
-&& pip3 install --no-cache-dir -r /app/FAIRSEQ_requirements.txt
+RUN git clone https://github.com/lydianish/fairseq.git /app/fairseq && \
+    cd /app/fairseq && \
+    git checkout rolaser && \
+    pip3 install --no-cache-dir --editable . && \
+    python3 setup.py build_ext --inplace && \
+    pip3 install --no-cache-dir -r /app/FAIRSEQ_requirements.txt
 
 WORKDIR /app/fairseq
 ENV FAIRSEQ /app/fairseq
@@ -42,45 +44,46 @@ RUN git clone https://github.com/lydianish/LASER.git /app/LASER
 WORKDIR /app/LASER
 ENV LASER /app/LASER
 
-RUN git checkout rolaser \
-&& bash ./install_external_tools.sh \
-&& pip3 install --no-cache-dir -r /app/LASER_requirements.txt
+RUN git checkout rolaser && \
+    bash ./install_external_tools.sh && \
+   pip3 install --no-cache-dir -r /app/LASER_requirements.txt
 
 # Install other RoLASER dependencies
 WORKDIR /app/RoLASER 
 RUN pip3 install --no-cache-dir -r /app/ROLASER_requirements.txt
 ENV ROLASER /app/RoLASER
 
-# Switch to the non-root user
-USER user
-
 # Download models
 WORKDIR /app/RoLASER/models
-RUN wget https://zenodo.org/api/records/10864557/files-archive
-RUN unzip files-archive
-
-RUN mkdir $LASER/models \
-&& mv laser* $LASER/models \
-&& mkdir RoLASER \
-&& mv rolaser* RoLASER/ \
-&& mkdir c-RoLASER \
-&& mv c-rolaser* c-RoLASER/ \
-&& rm files-archive
+RUN wget https://zenodo.org/api/records/10864557/files-archive && \
+    unzip files-archive && \
+    mkdir $LASER/models && \
+    mv laser* $LASER/models && \
+    mkdir RoLASER && \
+    mv rolaser* RoLASER/ && \
+    mkdir c-RoLASER && \
+    mv c-rolaser* c-RoLASER/ && \
+    rm files-archive
+COPY --chown=user . /app/RoLASER/models
+WORKDIR /app/LASER/models
+COPY --chown=user . /app/LASER/models
 
 # Set Python system path to find the Fairseq and LASER modules
 ENV PYTHONPATH $PYTHONPATH:$FAIRSEQ
 ENV PYTHONPATH $PYTHONPATH:$LASER/source
 
+# Switch to the non-root user
+USER user
 # Set home to the user's home directory
 ENV HOME /home/user
 ENV PATH $HOME/.local/bin:$PATH
 
-# WORKDIR $HOME
-# RUN mkdir app
+WORKDIR $HOME
+RUN mkdir app
 # Set the working directory to the user's home directory
-# WORKDIR $HOME/app
+WORKDIR $HOME/app
 # Copy the current directory contents into the container at $HOME/app setting the owner to the user
-# COPY --chown=user . $HOME/app
+COPY --chown=user . $HOME/app
 
 EXPOSE 8501
 CMD streamlit run app.py \