Improve dockerfile

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

Dockerfile

@@ -20,21 +20,22 @@ RUN adduser --disabled-password --gecos '' theia && \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
     chown -R theia:theia /home/theia
 
+RUN echo "Installing python modules in system python versions" \
+    && PY_PATHS="/usr/bin/python /usr/bin/python3 and /usr/local/bin/python3" \
+    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade pip setuptools wheel; done \
+    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade tox tox-pyenv ipython pylint pytest mock nose flake8 flake8-docstrings autopep8; done \
+    && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done \
+    && /usr/local/bin/python3 -m pip install -U black isort 
+    #&& ln -f -s /home/theia/.pyenv/versions/*/bin/black /bin/ \
+    #&& ln -f -s /home/theia/.pyenv/versions/*/bin/isort /bin/ 
 
 USER theia
 WORKDIR /home/theia
 
-# Python2 and Python3 are installed by parent Dockerfile:
-# https://github.com/theia-ide/theia-apps/blob/master/theiaide/theia-python/Dockerfile
-# Here we save the preinstalled python paths because we need to use them later.
-
-RUN which python > ~/python2_path
-RUN which python3 > ~/python3_path
-
 RUN /bin/bash -c " \
    git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
    && git clone https://github.com/momo-lab/xxenv-latest.git ~/.pyenv/plugins/latest \
-   "
+   && git clone https://github.com/doloopwhile/pyenv-register.git ~/.pyenv/plugins/pyenv-register"
 
 RUN echo 'export PYENV_ROOT="/home/theia/.pyenv"' >> ~/.bashrc \
    && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
@@ -50,27 +51,19 @@ RUN export PATH=/home/theia/.pyenv/bin:$PATH; \
    && pyenv latest install 3.7 \
    && pyenv latest install 3.8 \
    && pyenv install 3.9-dev \
+   && pyenv register /usr/bin/python \
+   && pyenv register /usr/bin/python3 \
+   && pyenv register /usr/local/bin/python3 \
    && pyenv local $(pyenv versions --bare) \
    && pyenv versions
 
-RUN echo "Installing python modules" \
-    && PY_PATHS=$(ls -1 /home/theia/.pyenv/versions/*/bin/python?.?) \
+RUN echo "Installing python modules in pyenv python versions" \
+    && PY_PATHS=$(ls -1 /home/theia/.pyenv/versions/[0-9]*/bin/python?.?) \
     && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade pip setuptools wheel; done \
     && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade tox tox-pyenv ipython pylint pytest mock nose flake8 flake8-docstrings autopep8; done \
     && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done 
 
-USER root
 
-RUN echo "Installing python modules" \
-    && PY_PATHS=$(cat /home/theia/python3_path && cat /home/theia/python2_path) \
-    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade pip setuptools wheel; done \
-    && for v in ${PY_PATHS}; do echo "******* ${v} *******"; ${v} -m pip install --upgrade tox tox-pyenv ipython pylint pytest mock nose flake8 flake8-docstrings autopep8; done \
-    && for v in ${PY_PATHS}; do ${v} -m pip install -r /tmp/requirements.txt; done \
-    && /home/theia/.pyenv/versions/*/bin/python3.8 -m pip install -U black isort \
-    && ln -f -s /home/theia/.pyenv/versions/*/bin/black /bin/ \
-    && ln -f -s /home/theia/.pyenv/versions/*/bin/isort /bin/ 
-
-USER theia
 WORKDIR /home/theia
 
 ENV PYTHONPATH=/home/project:$PYTHONPATH