udpate

Dockerfile

@@ -1,35 +1,45 @@
 FROM python:3.9
 
-RUN useradd -rm -d /code/ubuntu -s /bin/bash -g root -G sudo -u 1001 ubuntu
-USER ubuntu
+# RUN useradd -rm -d /code/ubuntu -s /bin/bash -g root -G sudo -u 1001 ubuntu
+# USER ubuntu
 
-WORKDIR /code/ubuntu
-RUN chmod 777 /code/ubuntu
+WORKDIR /code
+RUN chmod 777 /code
 
 # Install node >= 18.0.0 and npm
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo bash -
 RUN apt-get install -y nodejs
 
+RUN useradd -m -u 1000 user
+
+USER user
+
+ENV HOME=/home/user \
+	PATH=/home/user/.local/bin:$PATH
+
+WORKDIR $HOME
+
+
 RUN git clone https://github.com/hazyresearch/meerkat.git
-WORKDIR /code/ubuntu/meerkat/
+WORKDIR $HOME/meerkat/
 RUN git checkout clever-dev
 
-WORKDIR /code/ubuntu/meerkat/meerkat/interactive/app/
+WORKDIR $HOME/meerkat/meerkat/interactive/app/
 RUN npm install
 
-WORKDIR /code/ubuntu/meerkat/
+WORKDIR $HOME/meerkat/
 RUN pip install --no-cache-dir --upgrade .
 
-COPY . .
+COPY --chown=user . $HOME/
 
 # Set env variables
-RUN mkdir /code/ubuntu/logs
-RUN chmod 777 /code/ubuntu/logs
-ENV MEERKAT_LOG_DIR=/code/ubuntu/logs
-RUN chmod 777 /code/ubuntu/
-ENV MEERKAT_CONFIG=/code/ubuntu/config.yaml
+RUN mkdir $HOME/logs
+RUN chmod 777 $HOME/logs
+ENV MEERKAT_LOG_DIR=$HOME/logs
+RUN chmod 777 $HOME/
+ENV MEERKAT_CONFIG=$HOME/config.yaml
 
-COPY ./tutorial-1.py /code/ubuntu/tutorial-1.py
+COPY --chown=user ./tutorial-1.py $HOME/tutorial-1.py
 
 # CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860"]
-CMD ["mk", "run", "/code/ubuntu/tutorial-1.py", "--host", "0.0.0.0", "--api-port", "7860"]
+CMD ["mk", "run", "/code/tutorial-1.py", "--host", "0.0.0.0", "--api-port", "7860"]