diff options
| author |  Matt Kwong <mattkwong@google.com> | 2016-11-02 18:07:40 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2016-11-02 18:07:40 -0700 |
| commit | 1347e4056328bb7899793a9a860d01f36c11d7ee (patch) | |
| tree | 4f4409589b43f8bcc0baec5c5cdf3fa58b2e1641 /tools/dockerfile | |
| parent | ea14e0e2a0ad698855d052e2fe8ba0b7e8114c57 (diff) | |
Use Jessie instead of Ubuntu Dockerfile for GCC-4.8 tests
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 4 | ||||
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 1f6641ac42..e968a0f589 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -129,5 +129,9 @@ RUN mkdir /var/local/jenkins #================ # libuv RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz && tar -xf libuv-v1.9.1.tar.gz && cd libuv-v1.9.1 && sh autogen.sh && ./configure --prefix=/usr && make && make install + +# 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/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index bee0849c67..f985480254 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -93,5 +93,9 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ RUN mkdir /var/local/jenkins + +# 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"] |