<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p>On 16-10-2019 14:10, Stephen Finucane wrote:<br>
</p>
<blockquote type="cite"
cite="mid:20191016121014.29201-1-stephen@that.guru">
<pre>It seems less likely that tox and tox-pyenv will change than our
requirements. Split up the 'RUN' steps so we don't have to reinstall the
former every time the latter change.
Signed-off-by: Stephen Finucane <a class="moz-txt-link-rfc2396E" href="mailto:stephen@that.guru"><stephen@that.guru></a>
---
tools/docker/Dockerfile | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git tools/docker/Dockerfile tools/docker/Dockerfile
index 35324b13..a8e85ef0 100644
--- tools/docker/Dockerfile
+++ tools/docker/Dockerfile
@@ -47,15 +47,12 @@ RUN pyenv latest install 2.7 && \
pyenv latest install 3.5 && \
pyenv latest install 3.6 && \
pyenv latest install 3.7
-
RUN pyenv global $(pyenv versions --bare | tac)
-COPY requirements-*.txt /tmp/
-RUN pip install tox tox-pyenv && \
- pip install -r /tmp/requirements-dev.txt
+RUN pip install tox tox-pyenv
-# we deliberately leave the requirements files in tmp so we can
-# ping the user in entrypoint.sh if the change them!</pre>
</blockquote>
<p>The<br>
</p>
<p>"ping the user in entrypoint.sh if the change them!"</p>
<p>has some typo that I can't pin-point. <br>
</p>
<p>At least it is something that I'm report for extra care :-)<br>
</p>
<p><br>
</p>
<blockquote type="cite"
cite="mid:20191016121014.29201-1-stephen@that.guru">
<pre class="moz-quote-pre" wrap="">
+COPY requirements-dev.txt requirements-test.txt /opt/
+RUN pip install -r /opt/requirements-dev.txt
COPY tools/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
</pre>
</blockquote>
<p><br>
</p>
<p>Cheers</p>
<p>Geert Stappers</p>
<p><br>
</p>
</body>
</html>