2 files changed, 5 insertions, 21 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template
index 05b2f7be64..b9982b0b0f 100644
--- a/templates/tools/dockerfile/test/sanity/Dockerfile.template
+++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template
@@ -32,7 +32,6 @@
   FROM debian:jessie
   
   <%include file="../../apt_get_basic.include"/>
-  <%include file="../../cxx_deps.include"/>
   #========================
   # Sanity test dependencies
   RUN apt-get update && apt-get install -y python-pip
@@ -44,5 +43,8 @@
   # This makes sure that the docker binary we inject has its dependencies.
   RUN curl https://get.docker.com/ | sh
   RUN apt-get remove --purge -y docker-engine
-
-  <%include file="../../run_tests_addons.include"/>
+  
+  RUN mkdir /var/local/jenkins
+  
+  # Define the default command.
+  CMD ["bash"]
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"]
-