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 /tools/dockerfile/test | |
| parent | 048bb0713b4952ba6c9340cc944458ce99715fbc (diff) | |
Readd cmake backport to Jessie
Diffstat (limited to 'tools/dockerfile/test')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 9 | ||||
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index ad1fbec5df..c4f959fc1d 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -72,6 +72,13 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t # C++ dependencies RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean +#================= +# Use cmake 3.6 from jessie-backports +# should only be used for images based on debian jessie. + +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list +RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean + RUN mkdir /var/local/jenkins @@ -83,4 +90,4 @@ RUN cd /tmp && wget http://dist.libuv.org/dist/v1.9.1/libuv-v1.9.1.tar.gz 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/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index 84d811dbba..d07ea9a9b0 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -75,6 +75,13 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c RUN mkdir /var/local/jenkins +#================= +# Use cmake 3.6 from jessie-backports +# should only be used for images based on debian jessie. + +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list +RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean + # 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 |