aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/test
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2018-03-21 08:32:32 +0100
committerGravatar Jan Tattermusch <jtattermusch@google.com>2018-03-21 08:32:32 +0100
commitffc2345ec83ac9ccf51aeaa72979b2ac52edbbac (patch)
tree9a0bbfb5b998862e49d92477a7060dfb1da3cf2a /tools/dockerfile/test
parent8327acd9a23d80e979eb890b71a53966c3509a6d (diff)
fix resolver_component_tests_runner test in gcc_musl
Diffstat (limited to 'tools/dockerfile/test')
-rw-r--r--tools/dockerfile/test/cxx_alpine_x64/Dockerfile18
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
index 8e5403fdfd..c68a5ddbde 100644
--- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile
@@ -39,23 +39,27 @@ RUN apk update && apk add \
# Install Python packages from PyPI
RUN pip install --upgrade pip==9.0.1
RUN pip install virtualenv
-RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.10.0
+RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.0.post1 six==1.10.0 twisted==17.5.0
# Google Cloud platform API libraries
RUN pip install --upgrade google-api-python-client
+# Install gflags
+RUN git clone https://github.com/gflags/gflags.git && cd gflags && git checkout v2.2.0
+RUN cd gflags && cmake . && make && make install
+RUN ln -s /usr/local/include/gflags /usr/include/gflags
+
# 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/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++
-# Install gflags
-RUN git clone https://github.com/gflags/gflags.git && cd gflags && git checkout v2.2.0
-RUN cd gflags && cmake . && make && make install
-RUN ln -s /usr/local/include/gflags /usr/include/gflags
-RUN mkdir -p /var/local/jenkins
+RUN mkdir /var/local/jenkins
+
# Define the default command.
CMD ["bash"]