From faa5f51b4bb46ed652e1ad31119df3f9086f7453 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 13 Feb 2015 21:38:11 +0100
Subject: Renaming the docker image to grpc_clang, and optimizing the build a
 bit.

---
 tools/dockerfile/grpc_clang/Dockerfile | 32 ++++++++++++++++++++++++++++++++
 tools/dockerfile/msan_cxx/Dockerfile   | 29 -----------------------------
 2 files changed, 32 insertions(+), 29 deletions(-)
 create mode 100644 tools/dockerfile/grpc_clang/Dockerfile
 delete mode 100644 tools/dockerfile/msan_cxx/Dockerfile

(limited to 'tools')

diff --git a/tools/dockerfile/grpc_clang/Dockerfile b/tools/dockerfile/grpc_clang/Dockerfile
new file mode 100644
index 0000000000..0928121755
--- /dev/null
+++ b/tools/dockerfile/grpc_clang/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:latest
+
+RUN apt-get update && apt-get install -y \
+  cmake \
+  g++ \
+  gcc \
+  git \
+  make \
+  python \
+  && apt-get clean
+
+RUN git clone -b release_36 http://llvm.org/git/llvm.git
+RUN git clone -b release_36 http://llvm.org/git/clang.git
+RUN git clone -b release_36 http://llvm.org/git/compiler-rt.git
+RUN git clone -b release_36 http://llvm.org/git/clang-tools-extra.git
+RUN git clone -b release_36 http://llvm.org/git/libcxx.git
+RUN git clone -b release_36 http://llvm.org/git/libcxxabi.git
+
+RUN mv clang llvm/tools
+RUN mv compiler-rt llvm/projects
+RUN mv clang-tools-extra llvm/tools/clang/tools
+RUN mv libcxx llvm/projects
+RUN mv libcxxabi llvm/projects
+
+RUN mkdir llvm-build
+RUN cd llvm-build && cmake \
+  -DCMAKE_BUILD_TYPE:STRING=Release \
+  -DLLVM_TARGETS_TO_BUILD:STRING=X86 \
+  ../llvm
+RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build
+
+CMD ["bash"]
diff --git a/tools/dockerfile/msan_cxx/Dockerfile b/tools/dockerfile/msan_cxx/Dockerfile
deleted file mode 100644
index d12cee6b5d..0000000000
--- a/tools/dockerfile/msan_cxx/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt-get update && apt-get install -y \
-  cmake \
-  g++ \
-  gcc \
-  git \
-  make \
-  python \
-  && apt-get clean
-
-RUN git clone -b release_36 http://llvm.org/git/llvm.git
-RUN git clone -b release_36 http://llvm.org/git/clang.git
-RUN git clone -b release_36 http://llvm.org/git/compiler-rt.git
-RUN git clone -b release_36 http://llvm.org/git/clang-tools-extra.git
-RUN git clone -b release_36 http://llvm.org/git/libcxx.git
-RUN git clone -b release_36 http://llvm.org/git/libcxxabi.git
-
-RUN mv clang llvm/tools
-RUN mv compiler-rt llvm/projects
-RUN mv clang-tools-extra llvm/tools/clang/tools
-RUN mv libcxx llvm/projects
-RUN mv libcxxabi llvm/projects
-
-RUN mkdir llvm-build
-RUN cd llvm-build && cmake ../llvm
-RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build
-
-CMD ["bash"]
-- 
cgit v1.2.3


From 6fd5a35ecccac262412eae1f45762082f4c92079 Mon Sep 17 00:00:00 2001
From: Donna Dionne <donnadionne@google.com>
Date: Fri, 13 Feb 2015 13:03:49 -0800
Subject: Setting default ssh directory in the case of test runs running as
 root.

---
 tools/gce_setup/grpc_docker.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools')

diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index 2e02653864..1c38582cb8 100755
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@@ -24,6 +24,10 @@
 # Allows gcloud ssh commands to run on freshly started docker instances.
 _grpc_ensure_gcloud_ssh() {
   local default_key_file="$HOME/.ssh/google_compute_engine"
+  if [ "$HOME" == "/" ]
+  then
+    default_key_file="/root/.ssh/google_compute_engine"
+  fi
   [ -f $default_key_file ] || {
     ssh-keygen -f $default_key_file -N '' > /dev/null || {
       echo "could not precreate $default_key_file" 1>&2
-- 
cgit v1.2.3