diff options
| author |  siddharthshukla <s.shukla@jacobs-university.de> | 2016-07-07 16:08:01 +0200 |
|---|---|---|
| committer | siddharthshukla <s.shukla@jacobs-university.de> | 2016-07-12 01:35:53 +0200 |
| commit | 0589e533cd65a2ca9e0e610cc1b284d016986572 (patch) | |
| tree | a7848ae0a0cbb3fb94a49987d8bc33c3683d578b /tools/dockerfile/test/cxx_jessie_x86/Dockerfile | |
| parent | 7126163b92c4b6be0ed8f9954e29fd9965cd7bb6 (diff) | |
Make testing toolchain python 3.x compliant
six is necessary for making these scripts cross compatible
between python 2.x and 3.x
Changes:
Add six to python_deps.include
Include python_deps.include to all Dockerfile templates in test directory
Include python_deps.include to all Dockerfile templates in stress_test directory
Include python_deps.include to all Dockerfile templates in interop_test directory
Replace print statements with print function calls (from futute..)
Replace .iteritems() with .items() wherever necessary
use six.moves to import BaseHTTPServer
Generate new dockerfiles using generate_projects.sh
Diffstat (limited to 'tools/dockerfile/test/cxx_jessie_x86/Dockerfile')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index abd3e42f26..bee0849c67 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -63,6 +63,21 @@ RUN apt-get update && apt-get install -y \ # Build profiling RUN apt-get update && apt-get install -y time && apt-get clean +#==================== +# Python dependencies + +# Install dependencies + +RUN apt-get update && apt-get install -y \ + python-all-dev \ + python3-all-dev \ + python-pip + +# Install Python packages from PyPI +RUN pip install pip --upgrade +RUN pip install virtualenv +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0 + #================= # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean |