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 /templates/tools/dockerfile/test/php_jessie_x64 | |
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 'templates/tools/dockerfile/test/php_jessie_x64')
-rw-r--r-- | templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template index fffac89efc..0cfa373c90 100644 --- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template @@ -32,8 +32,8 @@ FROM debian:jessie <%include file="../../apt_get_basic.include"/> + <%include file="../../python_deps.include"/> <%include file="../../php_deps.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] -
\ No newline at end of file |