diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-06-18 03:27:06 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-06-18 03:27:06 +0200 |
commit | 76fa6b6715fce31655874f5eaed3eab3fe585107 (patch) | |
tree | a7c04f5299897bd41767eda25aba1f42a1b147c7 | |
parent | 8a47ccd8b0fcb79eb4649ee64b73eabdfe0cd809 (diff) |
Switching from wheezy to jessie.
-rw-r--r-- | tools/jenkins/grpc_jenkins_slave/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index 541884e61a..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 \ @@ -38,12 +38,9 @@ RUN apt-get update && apt-get install -y \ autotools-dev \ build-essential \ bzip2 \ - clang \ - clang++ \ curl \ gcc \ git \ - libc++-dev \ libc6 \ libc6-dbg \ libc6-dev \ @@ -60,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 @@ -68,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 \ |