From: Stephen Finucane Date: Sat, 3 Sep 2016 17:49:02 +0000 (+0100) Subject: docker: Install dependencies for Python 2 also X-Git-Tag: v2.0.0-rc1~243 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d55045d97cb1d26e50149963a6172d53d5b638e;p=thirdparty%2Fpatchwork.git docker: Install dependencies for Python 2 also 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 Acked-by: Daniel Axtens --- diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index b39204c6..883d43ab 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!