diff options
| author | Stephen Finucane <stephenfinucane@hotmail.com> | 2016-09-03 18:49:02 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfinucane@hotmail.com> | 2016-09-20 00:11:29 +0100 |
| commit | 0d55045d97cb1d26e50149963a6172d53d5b638e (patch) | |
| tree | 8e778deced17fa5cffb361e6bb4bb016025fa4f2 | |
| parent | 60c9d1c19e8749ae6fcc3ef4ccc77030826ed4e9 (diff) | |
| download | patchwork-0d55045d97cb1d26e50149963a6172d53d5b638e.tar patchwork-0d55045d97cb1d26e50149963a6172d53d5b638e.tar.gz | |
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 <stephenfinucane@hotmail.com>
Acked-by: Daniel Axtens <dja@axtens.net>
| -rw-r--r-- | tools/docker/Dockerfile | 7 |
1 files 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! |