From d4d9653e0574842f33289a239b645bdd62f01963 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 3 Jun 2016 13:58:33 -0500
Subject: [PATCH] Port @ellismg's debian docker file fix to CLI.

---
 scripts/docker/debian/Dockerfile | 79 ++++++++++++--------------------
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/scripts/docker/debian/Dockerfile b/scripts/docker/debian/Dockerfile
index 3798f757f..fe062be44 100644
--- a/scripts/docker/debian/Dockerfile
+++ b/scripts/docker/debian/Dockerfile
@@ -7,60 +7,39 @@
 FROM debian:jessie
 
 # Misc Dependencies for build
-RUN apt-get update && apt-get -qqy install curl unzip gettext sudo
+RUN apt-get update && \
+    apt-get -qqy install \
+        curl \
+        unzip \
+        gettext \
+        sudo && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib)
-RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main"  | tee /etc/apt/sources.list.d/llvm.list && \
-    curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \
-    apt-get update && apt-get -qqy install\
-	libc6 \
-	libedit2 \
-	libffi6 \
-	libgcc1 \
-	libicu52 \
-	liblldb-3.6 \
-	libllvm3.6 \
-	liblttng-ust0 \
-	liblzma5 \
-	libncurses5 \
-	libpython2.7 \
-	libstdc++6 \
-	libtinfo5 \
-	libunwind8 \
-	libuuid1 \
-	zlib1g \
-	libasn1-8-heimdal \
-	libcomerr2 \
-	libcurl3 \
-	libgpg-error0 \
-	libgssapi3-heimdal \
-	libgssapi-krb5-2 \
-	libhcrypto4-heimdal \
-	libheimbase1-heimdal \
-	libheimntlm0-heimdal \
-	libhx509-5-heimdal \
-	libidn11 \
-	libk5crypto3 \
-	libkeyutils1 \
-	libkrb5-26-heimdal \
-	libkrb5-3 \
-	libkrb5support0 \
-	libldap-2.4-2 \
-	libp11-kit0 \
-	libroken18-heimdal \
-	libsasl2-2 \
-	libsqlite3-0 \
-	libssl1.0.0 \
-	libssl-dev \
-	libtasn1-6 \
-	libwind0-heimdal
-
-# Install Dotnet CLI dependencies.
-# clang is required for dotnet-compile-native
-RUN apt-get -qqy install clang-3.5
+RUN apt-get update &&\
+    apt-get -qqy install \
+        libunwind8 \
+        libkrb5-3 \
+        libicu52 \
+        liblttng-ust0 \
+        libssl1.0.0 \
+        zlib1g \
+        libuuid1 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # Install Build Prereqs
-RUN apt-get -qq install -y debhelper build-essential devscripts git cmake
+RUN apt-get update && \
+    apt-get -qqy install \
+        debhelper \
+        build-essential \
+        devscripts \
+        git \
+        cmake \
+        clang-3.5 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # Use clang as c++ compiler
 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100