diff options
| author | Richard Belleville <rbellevi@google.com> | 2019-06-03 14:25:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 14:25:03 -0700 |
| commit | e18241d4c8288ef3c96878b9550b1250d60c0245 (patch) | |
| tree | 9e416873161012283096afc11bcab4706eedd31b /tools | |
| parent | b8759c2af4e234c724fc2898b0f444c51d0782cf (diff) | |
| parent | 371a55a0fff1480818932c44feaf76fe00e124dc (diff) | |
| download | grpc-grpc-e18241d4c8288ef3c96878b9550b1250d60c0245.tar.gz | |
Merge pull request #19200 from gnossen/upgrade_arm_build_environment
Update Python packages before building ARM wheels.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_armv6/Dockerfile | 6 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_armv7/Dockerfile | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/dockerfile/grpc_artifact_linux_armv6/Dockerfile b/tools/dockerfile/grpc_artifact_linux_armv6/Dockerfile index fb83a5ca6a..e2c406599d 100644 --- a/tools/dockerfile/grpc_artifact_linux_armv6/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_armv6/Dockerfile @@ -14,11 +14,13 @@ # Docker file for building gRPC Raspbian binaries +# TODO(https://github.com/grpc/grpc/issues/19199): Move off of this image. FROM quay.io/grpc/raspbian_armv6 # Place any extra build instructions between these commands # Recommend modifying upstream docker image (quay.io/grpc/raspbian_armv6) # for build steps because running them under QEMU is very slow # (https://github.com/kpayson64/armv7hf-debian-qemu) -# RUN [ "cross-build-start" ] -# RUN [ "cross-build-end" ] +RUN [ "cross-build-start" ] +RUN find /usr/local/bin -regex '.*python[0-9]+\.[0-9]+' | xargs -n1 -i{} bash -c "{} -m pip install --upgrade wheel setuptools" +RUN [ "cross-build-end" ] diff --git a/tools/dockerfile/grpc_artifact_linux_armv7/Dockerfile b/tools/dockerfile/grpc_artifact_linux_armv7/Dockerfile index 0b68df52d1..735c2e85b2 100644 --- a/tools/dockerfile/grpc_artifact_linux_armv7/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_armv7/Dockerfile @@ -14,11 +14,13 @@ # Docker file for building gRPC Raspbian binaries +# TODO(https://github.com/grpc/grpc/issues/19199): Move off of this base image. FROM quay.io/grpc/raspbian_armv7 # Place any extra build instructions between these commands # Recommend modifying upstream docker image (quay.io/grpc/raspbian_armv7) # for build steps because running them under QEMU is very slow # (https://github.com/kpayson64/armv7hf-debian-qemu) -# RUN [ "cross-build-start" ] -# RUN [ "cross-build-end" ] +RUN [ "cross-build-start" ] +RUN find /usr/local/bin -regex '.*python[0-9]+\.[0-9]+' | xargs -n1 -i{} bash -c "{} -m pip install --upgrade wheel setuptools" +RUN [ "cross-build-end" ] |