diff options
| author |  yang-g <yangg@google.com> | 2016-07-18 16:30:58 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-07-18 16:30:58 -0700 |
| commit | c76e48b8d38ed8d1c0359a3da2e60b87b93a99d9 (patch) | |
| tree | f3c9e2b5e9f3d5345f6e46f07e6414262acd0377 /templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template | |
| parent | 9275d4067cfd9233edf2ae9a0fe1255c8c730f19 (diff) | |
| parent | 2eebe29ec84ed6b2d5c64016b12e1782281d5a38 (diff) | |
Merge remote-tracking branch 'upstream/master' into shut_down_acceptor_early
Diffstat (limited to 'templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template')
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template index 7f43e759fc..49fbea0f45 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template @@ -32,8 +32,8 @@ FROM 32bit/debian:jessie <%include file="../../apt_get_basic.include"/> + <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] -
\ No newline at end of file |