Fix user

Dockerfile

@@ -10,28 +10,30 @@ RUN apt-get update && apt-get install -y \
     	ffmpeg libsm6 libxext6 cmake libgl1-mesa-glx \
 		&& rm -rf /var/lib/apt/lists/*
 
-
-RUN apt-get -y update
-RUN apt install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa
-RUN apt-get -y install python3.8
-RUN apt-get -y install python3-pip
-RUN apt install -y python3.8-distutils
-RUN apt-get install -y gcc
-RUN apt-get install -y python3.8-dev
-
-RUN useradd -ms /bin/bash admin
+# RUN apt-get -y update
+# RUN apt install -y software-properties-common
+# RUN add-apt-repository ppa:deadsnakes/ppa
+# RUN apt-get -y install python3.8
+# RUN apt-get -y install python3-pip
+# RUN apt install -y python3.8-distutils
+# RUN apt-get install -y gcc
+# RUN apt-get install -y python3.8-dev
+
+# RUN useradd -ms /bin/bash admin
+# USER admin
+
+RUN useradd -ms /bin/bash user
 USER admin
 
-# ENV HOME=/home/user \
-# 	PATH=/home/user/.local/bin:$PATH
+ENV HOME=/home/user \
+	PATH=/home/user/.local/bin:$PATH
 
-# RUN curl https://pyenv.run | bash
-# ENV PATH=$HOME/.pyenv/shims:$HOME/.pyenv/bin:$PATH
-# RUN pyenv install 3.8.15 && \
-#     pyenv global 3.8.15 && \
-#     pyenv rehash && \
-#     pip install --no-cache-dir --upgrade pip setuptools wheel
+RUN curl https://pyenv.run | bash
+ENV PATH=$HOME/.pyenv/shims:$HOME/.pyenv/bin:$PATH
+RUN pyenv install 3.8.15 && \
+    pyenv global 3.8.15 && \
+    pyenv rehash && \
+    pip install --no-cache-dir --upgrade pip setuptools wheel
 
 ENV WORKDIR=/code
 WORKDIR $WORKDIR
@@ -43,15 +45,16 @@ RUN chmod 755 $WORKDIR
 
 COPY requirements.txt $WORKDIR/requirements.txt
 COPY oneformer $WORKDIR/oneformer
-RUN python3.8 --version
-RUN which python3.8
-RUN python3.8 -m pip install --upgrade pip
-RUN python3.8 -m pip install multidict
-RUN python3.8 -m pip install typing-extensions
-RUN python3.8 -m pip install --upgrade setuptools
-RUN python3.8 -m pip install wheel
-RUN python3.8 -m pip install cython
-RUN python3.8 -m pip install --no-cache-dir --upgrade -r $WORKDIR/requirements.txt
+# RUN python3.8 --version
+# RUN which python3.8
+# RUN python3.8 -m pip install --upgrade pip
+# RUN python3.8 -m pip install multidict
+# RUN python3.8 -m pip install typing-extensions
+# RUN python3.8 -m pip install --upgrade setuptools
+# RUN python3.8 -m pip install wheel
+# RUN python3.8 -m pip install cython
+# RUN python3.8 -m pip install --no-cache-dir --upgrade -r $WORKDIR/requirements.txt
+RUN pip install --no-cache-dir --upgrade -r $WORKDIR/requirements.txt
 
 COPY . .
 
@@ -64,4 +67,4 @@ USER admin
 
 EXPOSE 7860
 
-ENTRYPOINT ["python3.8", "gradio_app.py"]
+ENTRYPOINT ["python", "gradio_app.py"]

deform_setup.sh

@@ -13,10 +13,10 @@ pip3 freeze | grep natten
 echo '----------------------------------------------------------------'
 echo '----------------------------------------------------------------'
 
-echo '----------------------------------------------------------------'
-echo '----------------------------------------------------------------'
-cd /home/user/.pyenv/versions/3.8.15/lib/python3.8/site-packages
-ls
-ls | grep MultiScale
-echo '----------------------------------------------------------------'
-echo '----------------------------------------------------------------'
+# echo '----------------------------------------------------------------'
+# echo '----------------------------------------------------------------'
+# cd /home/user/.pyenv/versions/3.8.15/lib/python3.8/site-packages
+# ls
+# ls | grep MultiScale
+# echo '----------------------------------------------------------------'
+# echo '----------------------------------------------------------------'