aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/grpc_artifact_linux_x64
diff options
context:
space:
mode:
authorGravatar murgatroid99 <mlumish@google.com>2017-07-06 10:15:11 -0700
committerGravatar murgatroid99 <mlumish@google.com>2017-07-06 10:15:11 -0700
commit882ba60fcb2cdec28c7d3a2a74914f3a2eeba8e9 (patch)
tree03e2251852bf9cc3fafdc7b20cbaf35e1a2f8d52 /tools/dockerfile/grpc_artifact_linux_x64
parent9796c8a31af5b91e4c98281a0a6cd768d52d5e77 (diff)
parent9780f9364664a359ebf6f5fc11dda7782785c20c (diff)
Merge remote-tracking branch 'upstream/v1.4.x' into master_1.4.1_upmerge
Diffstat (limited to 'tools/dockerfile/grpc_artifact_linux_x64')
-rw-r--r--tools/dockerfile/grpc_artifact_linux_x64/Dockerfile8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
index 60cb3b8bde..c667655afb 100644
--- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
@@ -86,6 +86,14 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
RUN apt-get update && apt-get install -y \
php5 php5-dev php-pear phpunit
+##################
+# Install cross compiler for ARM
+
+RUN echo 'deb http://emdebian.org/tools/debian/ jessie main' | tee -a /etc/apt/sources.list.d/crosstools.list && \
+ curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
+
+RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y crossbuild-essential-armhf
+
RUN mkdir /var/local/jenkins
# Define the default command.