Merge remote-tracking branch 'origin/main'

Dockerfile

@@ -1,51 +1,8 @@
 # Start from the TGI base image
 FROM ghcr.io/huggingface/text-generation-inference:2.0 as base
 
-#COPY ./requirements.txt /code/requirements.txt
-#
-#RUN pip install -r /code/requirements.txt
-#RUN pip install jupyterlab jupyterlab-vim==0.15.1 jupyterlab-vimrc
-
-# Remove any third-party apt sources to avoid issues with expiring keys.
-# Install some basic utilities
-RUN rm -f /etc/apt/sources.list.d/*.list && \
-    apt-get update && apt-get install -y --no-install-recommends \
-    curl \
-    ca-certificates \
-    sudo \
-    git \
-    git-lfs \
-    zip \
-    unzip \
-    htop \
-    bzip2 \
-    libx11-6 \
-    build-essential \
-    libsndfile-dev \
-    software-properties-common \
- && rm -rf /var/lib/apt/lists/*
-
-RUN add-apt-repository ppa:flexiondotorg/nvtop && \
-    apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends nvtop
-
-RUN curl -sL https://deb.nodesource.com/setup_14.x  | bash - && \
-    apt-get install -y nodejs && \
-    npm install -g configurable-http-proxy
-
-# Create a working directory
-WORKDIR /app
-
-# Create a non-root user and switch to it
-RUN adduser --disabled-password --gecos '' --shell /bin/bash user \
- && chown -R user:user /app
-RUN echo "user ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/90-user
-USER user
-
-# All users can use /home/user as their home directory
-ENV HOME=/home/user
-RUN mkdir $HOME/.cache $HOME/.config \
- && chmod -R 777 $HOME
+# Install git
+RUN apt-get update && apt-get install -y git
 
 # Set up the Conda environment
 ENV CONDA_AUTO_UPDATE_CONDA=false \
@@ -58,24 +15,10 @@ RUN curl -sLo ~/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-py39
 
 WORKDIR $HOME/app
 
-#######################################
-# Start root user section
-#######################################
-
-USER root
-
-COPY ./jupyterlab/packages.txt /root/packages.txt
-
-# User Debian packages
-## Security warning : Potential user code executed as root (build time)
-RUN --mount=target=/root/packages.txt,source=packages.txt \
-    apt-get update && \
-    xargs -r -a /root/packages.txt apt-get install -y --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN --mount=target=/root/on_startup.sh,source=on_startup.sh,readwrite \
-	bash /root/on_startup.sh
+# Create a non-root user with UID 1000
+RUN useradd -m -u 1000 -s /bin/bash user
 
+# Create the /data directory and set its ownership
 RUN mkdir /data && chown user:user /data
 
 #######################################