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

Update Dockerfiles for python artifacts to use latest git version
narzolliam · Mar 5, 2018 · 673439d · 673439d
2 parents d3f7c0f + 32f7c48
commit 673439d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x64/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

diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile
@@ -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