diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-06-18 13:02:03 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-06-18 13:02:03 -0700 |
| commit | 7e997eba4f0873f8db000bcb3defb8f107bd3a8e (patch) | |
| tree | 6f8b9598196e1815504744c9e32eef91a8b58635 /tools | |
| parent | 94213dfa64408f2b267aa229ef3be481d5a6fb85 (diff) | |
| parent | 76fa6b6715fce31655874f5eaed3eab3fe585107 (diff) | |
Merge pull request #2116 from nicolasnoble/jenkins-clang
Adding clang packages for msan/tsan/asan testing.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jenkins/grpc_jenkins_slave/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index a9226c63cc..16b076cbbc 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -30,7 +30,7 @@ # A work-in-progress Dockerfile that allows running gRPC test suites # inside a docker container. -FROM debian:wheezy +FROM debian:jessie # Install Git. RUN apt-get update && apt-get install -y \ @@ -57,7 +57,7 @@ RUN apt-get update && apt-get install -y \ ################## # C++ dependencies -RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev +RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang ################# # C# dependencies @@ -65,9 +65,12 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev # Update to a newer version of mono RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list +RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list +RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list +RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list # Install dependencies -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \ mono-devel \ nunit \ nunit-console \ |