diff options
| author |  Matt Kwong <mattkwong@google.com> | 2018-05-22 11:07:35 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2018-05-23 10:52:47 -0700 |
| commit | cacc2ccbf0d37f57efdbc8f81ae8620d4a78366c (patch) | |
| tree | 1b48c043179d932acf9be2ade0a07daefd513b44 /templates/tools | |
| parent | 048bb0713b4952ba6c9340cc944458ce99715fbc (diff) | |
Readd cmake backport to Jessie
Diffstat (limited to 'templates/tools')
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template | 3 | ||||
| -rw-r--r-- | templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template index 6b00c862f9..01e22cce4c 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template @@ -20,6 +20,7 @@ <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> + <%include file="../../cmake_jessie_backports.include"/> <%include file="../../run_tests_addons.include"/> <%include file="../../libuv_install.include"/> @@ -27,4 +28,4 @@ RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean # Define the default command. - CMD ["bash"]
\ No newline at end of file + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template index 8011448b69..b9cd1e9828 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template @@ -21,6 +21,7 @@ <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> + <%include file="../../cmake_jessie_backports.include"/> # Install gcc-4.8 and other relevant items RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean |