Revert "pyenv: also install requirements for python2"

This reverts commit 5b904f91c4cab1ff3f8460c9d4ed920a990c8db3. It is no
longer necessary now that we're dropping Python 2.7 support.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index ba7ae29567326a54e1627cee713fcf228b981ba8..62ac461b7fccfbc0d4923f11a474dcf3157f18ee 100644 (file)
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -51,22 +51,14 @@ RUN pyenv latest install 2.7 && \
     pyenv latest install 3.6 && \
     pyenv latest install 3.7 && \
     pyenv latest install 3.8
+RUN pyenv global $(pyenv versions --bare | tac)
+
+RUN pip install tox tox-pyenv
 
 # we deliberately leave the requirements files in /opt so we can ping the user
 # in entrypoint.sh if they change
 COPY requirements-dev.txt requirements-test.txt /opt/
-
-# old python 2.7 deps
-RUN pyenv global $(pyenv versions --bare)
-
-RUN pip install tox tox-pyenv && \
-    pip install -r /opt/requirements-dev.txt
-
-# most recent python deps
-RUN pyenv global $(pyenv versions --bare | tac)
-
-RUN pip install tox tox-pyenv && \
-    pip install -r /opt/requirements-dev.txt
+RUN pip install -r /opt/requirements-dev.txt
 
 COPY tools/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]