[PATCH] docker: Install dependencies for Python 2 also

Stephen Finucane stephenfinucane at hotmail.com
Sun Sep 4 03:49:02 AEST 2016


Aspects of both Patchwork and Django, such as the 'makemigrations'
management command, function differently under Python 3. It should be
possible to run these commands under Python 2. Install dependencies in
the Python 2 environment to make this a possibility.

Signed-off-by: Stephen Finucane <stephenfinucane at hotmail.com>
---
 tools/docker/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index b39204c..883d43a 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -30,9 +30,12 @@ RUN useradd --uid=$UID --create-home patchwork
 # Python requirements.
 # If you update requirements, you should rebuild the container.
 # entrypoint.sh will prompt you to do this.
+# we install both Python 2 and Python 3 versions so you can use either
 COPY requirements-*.txt /tmp/
-RUN pip3  install virtualenv tox && \
-    pip3  install -r /tmp/requirements-dev.txt
+RUN pip3 install virtualenv tox && \
+    pip3 install -r /tmp/requirements-dev.txt
+RUN pip2 install virtualenv tox && \
+    pip2 install -r /tmp/requirements-dev.txt
 # we deliberately leave the requirements files in tmp so we can
 # ping the user in entrypoint.sh if the change them!
 
-- 
2.7.4



More information about the Patchwork mailing list