aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/test
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2016-11-02 18:07:40 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2016-11-02 18:07:40 -0700
commit1347e4056328bb7899793a9a860d01f36c11d7ee (patch)
tree4f4409589b43f8bcc0baec5c5cdf3fa58b2e1641 /templates/tools/dockerfile/test
parentea14e0e2a0ad698855d052e2fe8ba0b7e8114c57 (diff)
Use Jessie instead of Ubuntu Dockerfile for GCC-4.8 tests
Diffstat (limited to 'templates/tools/dockerfile/test')
-rw-r--r--templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template4
-rw-r--r--templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template4
2 files changed, 8 insertions, 0 deletions
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
index 211baff2d1..35b0e177fb 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
@@ -37,5 +37,9 @@
<%include file="../../clang_update.include"/>
<%include file="../../run_tests_addons.include"/>
<%include file="../../libuv_install.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
+
# Define the default command.
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 49fbea0f45..643b5cb65b 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
@@ -35,5 +35,9 @@
<%include file="../../python_deps.include"/>
<%include file="../../cxx_deps.include"/>
<%include file="../../run_tests_addons.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
+
# Define the default command.
CMD ["bash"]