From 06047ee41338a0f4a943d8b072e846b6b1dfbe38 Mon Sep 17 00:00:00 2001
From: Bryan Thornbury <brthor@microsoft.com>
Date: Wed, 1 Jun 2016 18:06:37 -0700
Subject: [PATCH] Update only the ubuntu.14.04 dockerfile from
 https://github.com/dotnet/core-setup/pull/58

---
 scripts/docker/ubuntu.14.04/Dockerfile | 63 +++++++++++++++++++
 scripts/docker/ubuntu/Dockerfile       | 87 --------------------------
 2 files changed, 63 insertions(+), 87 deletions(-)
 create mode 100644 scripts/docker/ubuntu.14.04/Dockerfile
 delete mode 100644 scripts/docker/ubuntu/Dockerfile

diff --git a/scripts/docker/ubuntu.14.04/Dockerfile b/scripts/docker/ubuntu.14.04/Dockerfile
new file mode 100644
index 000000000..995a74b3b
--- /dev/null
+++ b/scripts/docker/ubuntu.14.04/Dockerfile
@@ -0,0 +1,63 @@
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Dockerfile that creates a container suitable to build dotnet-cli
+FROM ubuntu:14.04
+
+# Misc Dependencies for build
+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 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 update && \
+    apt-get -qqy install \
+        debhelper \
+        build-essential \
+        devscripts \
+        git \
+        cmake \
+        clang-3.5 \
+        lldb-3.6 && \
+    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
+RUN update-alternatives --set c++ /usr/bin/clang++-3.5
+
+# Setup User to match Host User, and give superuser permissions
+ARG USER_ID=0
+RUN useradd -m code_executor -u ${USER_ID} -g sudo
+RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# With the User Change, we need to change permissions on these directories
+RUN chmod -R a+rwx /usr/local
+RUN chmod -R a+rwx /home
+RUN chmod -R 755 /usr/lib/sudo
+
+# Set user to the one we just created
+USER ${USER_ID}
+
+# Set working directory
+WORKDIR /opt/code
diff --git a/scripts/docker/ubuntu/Dockerfile b/scripts/docker/ubuntu/Dockerfile
deleted file mode 100644
index c57e4e4ca..000000000
--- a/scripts/docker/ubuntu/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-# Dockerfile that creates a container suitable to build dotnet-cli
-FROM ubuntu:14.04
-
-# Misc Dependencies for build
-RUN apt-get update && apt-get -qqy install curl unzip gettext sudo
-
-# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib)
-RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-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 \
-	liburcu1 \
-	libuuid1 \
-	zlib1g \
-	libasn1-8-heimdal \
-	libcomerr2 \
-	libcurl3 \
-	libgcrypt11 \
-	libgnutls26 \
-	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 \
-	librtmp0 \
-	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
-
-# Install Build Prereqs
-RUN apt-get -qq install -y debhelper build-essential devscripts git cmake
-
-# Use clang as c++ compiler
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100
-RUN update-alternatives --set c++ /usr/bin/clang++-3.5
-
-# Setup User to match Host User, and give superuser permissions
-ARG USER_ID=0
-RUN useradd -m code_executor -u ${USER_ID} -g sudo
-RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-# With the User Change, we need to change permissions on these directories
-RUN chmod -R a+rwx /usr/local
-RUN chmod -R a+rwx /home
-RUN chmod -R 755 /usr/lib/sudo
-
-# Set user to the one we just created
-USER ${USER_ID}
-
-# Set working directory
-WORKDIR /opt/code