Merge pull request #14588 from ghostwriternr/task-runner-git-fix

Update Dockerfiles for python artifacts to use latest git version
pull/14597/head
Matt Kwong 7 years ago committed by GitHub
commit 673439d5bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile
  2. 12
      tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile

@ -18,19 +18,7 @@ FROM quay.io/pypa/manylinux1_x86_64
# Update the package manager
RUN yum update -y
#############################################################
# Update Git to allow cloning submodules with --reference arg
RUN yum remove -y git
RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc
RUN cd /usr/src && \
curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \
tar xzf git-2.0.5.tar.gz
RUN cd /usr/src/git-2.0.5 && \
make prefix=/usr/local/git all && \
make prefix=/usr/local/git install
ENV PATH /usr/local/git/bin:$PATH
RUN source /etc/bashrc
###################################
# Install Python build requirements

@ -18,19 +18,7 @@ FROM quay.io/pypa/manylinux1_i686
# Update the package manager
RUN yum update -y
#############################################################
# Update Git to allow cloning submodules with --reference arg
RUN yum remove -y git
RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc
RUN cd /usr/src && \
curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \
tar xzf git-2.0.5.tar.gz
RUN cd /usr/src/git-2.0.5 && \
make prefix=/usr/local/git all && \
make prefix=/usr/local/git install
ENV PATH /usr/local/git/bin:$PATH
RUN source /etc/bashrc
###################################
# Install Python build requirements

Loading…
Cancel
Save