aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2018-05-21 14:55:40 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2018-05-23 10:38:21 -0700
commit528775db084d5561f6bb4bc4c4fa69bd629dfa02 (patch)
tree24256b5327317f9b32e89166c977eb2e5983f3eb /templates/tools
parent67d7cdc45ab63d4ee0901e793e895dab238fb551 (diff)
Add Jessie Dockerfile using RBE's base
Diffstat (limited to 'templates/tools')
-rw-r--r--templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template2
-rw-r--r--templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template31
2 files changed, 32 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
index 9d559dfafa..8127231908 100644
--- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
@@ -29,4 +29,4 @@
RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean
# Define the default command.
- CMD ["bash"]
+ CMD ["bash"] \ No newline at end of file
diff --git a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template
new file mode 100644
index 0000000000..6070330e91
--- /dev/null
+++ b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template
@@ -0,0 +1,31 @@
+%YAML 1.2
+--- |
+ # Copyright 2018 gRPC authors.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # This is the base Docker image we use for running tests on RBE
+ FROM gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd
+
+ <%include file="../../apt_get_basic.include"/>
+ <%include file="../../gcp_api_libraries.include"/>
+ <%include file="../../python_deps.include"/>
+ #=================
+ # C++ dependencies (purposely excluding Clang because it's part of the base image)
+ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev && apt-get clean
+
+ # Link llvm-symbolizer to where our test scripts expect to find it
+ RUN ln -s /usr/local/bin/llvm-symbolizer /usr/bin/llvm-symbolizer
+
+ # Define the default command.
+ CMD ["bash"]