aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-08 12:26:28 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-08 17:23:02 -0800
commit8763501cf0d280002b9d30caf43c4ccf3db32fd9 (patch)
treefef5143c0b3850cc0c201c55362f735630274499 /tools
parent1978e26119257178b4274d5112194a97e3f2b90d (diff)
cleanup sanity docker image
Diffstat (limited to 'tools')
-rw-r--r--tools/dockerfile/test/sanity/Dockerfile18
1 files changed, 0 insertions, 18 deletions
diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile
index 317ad3217e..51ee49b448 100644
--- a/tools/dockerfile/test/sanity/Dockerfile
+++ b/tools/dockerfile/test/sanity/Dockerfile
@@ -63,10 +63,6 @@ RUN apt-get update && apt-get install -y \
# Build profiling
RUN apt-get update && apt-get install -y time && apt-get clean
-#=================
-# C++ dependencies
-RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
-
#========================
# Sanity test dependencies
RUN apt-get update && apt-get install -y python-pip
@@ -79,21 +75,7 @@ RUN pip install simplejson mako
RUN curl https://get.docker.com/ | sh
RUN apt-get remove --purge -y docker-engine
-# Prepare ccache
-RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
-RUN ln -s /usr/bin/ccache /usr/local/bin/g++
-RUN ln -s /usr/bin/ccache /usr/local/bin/cc
-RUN ln -s /usr/bin/ccache /usr/local/bin/c++
-RUN ln -s /usr/bin/ccache /usr/local/bin/clang
-RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
-
-#======================
-# Zookeeper dependencies
-# TODO(jtattermusch): is zookeeper still needed?
-RUN apt-get install -y libzookeeper-mt-dev
-
RUN mkdir /var/local/jenkins
# Define the default command.
CMD ["bash"]
-