Merge pull request #126 from readthedocs/humitos/move-env-labels-to-bottom

Author: humitos

Dockerfile

@@ -6,28 +6,6 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV APPDIR /app
 ENV LANG C.UTF-8
 
-# Versions, and expose labels for external usage
-ENV RTD_PYTHON_VERSION_27 2.7.16
-ENV RTD_PYTHON_VERSION_35 3.5.7
-ENV RTD_PYTHON_VERSION_36 3.6.8
-ENV RTD_PYTHON_VERSION_37 3.7.3
-ENV RTD_PYTHON_VERSION_38 3.8.0
-ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0
-
-# Note: 4.7.12.1 drastically increases memory usage
-ENV RTD_CONDA_VERSION 4.6.14
-
-ENV RTD_PIP_VERSION 20.0.1
-ENV RTD_SETUPTOOLS_VERSION 45.1.0
-ENV RTD_VIRTUALENV_VERSION 16.7.9
-LABEL python.version_27=$RTD_PYTHON_VERSION_27
-LABEL python.version_35=$RTD_PYTHON_VERSION_35
-LABEL python.version_36=$RTD_PYTHON_VERSION_36
-LABEL python.version_37=$RTD_PYTHON_VERSION_37
-LABEL python.version_38=$RTD_PYTHON_VERSION_38
-LABEL pypy.version_35=$RTD_PYPY_VERSION_35
-LABEL conda.version=$RTD_CONDA_VERSION
-
 # System dependencies
 RUN apt-get -y update
 RUN apt-get -y install \
@@ -136,6 +114,7 @@ RUN apt-get -y install \
       swig
 
 # Install Python tools/libs
+ENV RTD_VIRTUALENV_VERSION 16.7.9
 RUN apt-get -y install \
       python-pip \
  && pip install -U \
@@ -157,12 +136,6 @@ RUN useradd -m --uid 1005 --gid 205 docs
 USER docs
 WORKDIR /home/docs
 
-# Install Conda
-RUN curl -O https://repo.continuum.io/miniconda/Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh
-RUN bash Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh -b -p /home/docs/.conda/
-ENV PATH $PATH:/home/docs/.conda/bin
-RUN rm -f Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh
-
 # Install pyenv
 RUN wget https://github.com/pyenv/pyenv/archive/master.zip
 RUN unzip master.zip && \
@@ -171,6 +144,14 @@ RUN unzip master.zip && \
 ENV PYENV_ROOT /home/docs/.pyenv
 ENV PATH /home/docs/.pyenv/shims:$PATH:/home/docs/.pyenv/bin
 
+# Define Python versions to be installed via pyenv
+ENV RTD_PYTHON_VERSION_27 2.7.16
+ENV RTD_PYTHON_VERSION_35 3.5.7
+ENV RTD_PYTHON_VERSION_36 3.6.8
+ENV RTD_PYTHON_VERSION_37 3.7.3
+ENV RTD_PYTHON_VERSION_38 3.8.0
+ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0
+
 # Install supported Python versions
 RUN pyenv install $RTD_PYTHON_VERSION_27 && \
     pyenv install $RTD_PYTHON_VERSION_38 && \
@@ -188,12 +169,17 @@ RUN pyenv install $RTD_PYTHON_VERSION_27 && \
 
 WORKDIR /tmp
 
+# Python2 dependencies are hardcoded because Python2 is
+# deprecated. Updating them to their latest versions may raise
+# incompatibility issues.
 RUN pyenv local $RTD_PYTHON_VERSION_27 && \
     pyenv exec pip install --no-cache-dir -U pip==20.0.1 && \
     pyenv exec pip install --no-cache-dir -U setuptools==44.0.0 && \
     pyenv exec pip install --no-cache-dir --only-binary numpy,scipy numpy scipy && \
     pyenv exec pip install --no-cache-dir pandas matplotlib virtualenv==16.7.9
 
+ENV RTD_PIP_VERSION 20.0.1
+ENV RTD_SETUPTOOLS_VERSION 45.1.0
 RUN pyenv local $RTD_PYTHON_VERSION_38 && \
     pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \
     pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
@@ -224,6 +210,27 @@ RUN pyenv local $RTD_PYPY_VERSION_35 && \
     pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
     pyenv exec pip install --no-cache-dir virtualenv==$RTD_VIRTUALENV_VERSION
 
+# Install Conda
+WORKDIR /home/docs
+# Note: 4.7.12.1 drastically increases memory usage
+ENV RTD_CONDA_VERSION 4.6.14
+RUN curl -O https://repo.continuum.io/miniconda/Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh
+RUN bash Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh -b -p /home/docs/.conda/
+ENV PATH $PATH:/home/docs/.conda/bin
+RUN rm -f Miniconda2-${RTD_CONDA_VERSION}-Linux-x86_64.sh
+
 WORKDIR /
 
+# Adding labels for external usage
+LABEL python.version_27=$PYTHON_VERSION_27
+LABEL python.version_35=$PYTHON_VERSION_35
+LABEL python.version_36=$PYTHON_VERSION_36
+LABEL python.version_37=$PYTHON_VERSION_37
+LABEL python.version_38=$PYTHON_VERSION_38
+LABEL python.pip=$_PIP_VERSION
+LABEL python.setuptools=$SETUPTOOLS_VERSION
+LABEL python.virtualenv=$VIRTUALENV_VERSION
+LABEL pypy.version_35=$PYPY_VERSION_35
+LABEL conda.version=$CONDA_VERSION
+
 CMD ["/bin/bash"]