changed wheezy dockerfile to install git version > 1.7 to support local submodule cloning

pull/8182/head
Matt Kwong 9 years ago
parent 10dcccadfb
commit 66a1eea681
  1. 7
      tools/dockerfile/test/cxx_wheezy_x64/Dockerfile
  2. 18
      tools/run_tests/dockerize/docker_run_tests.sh

@ -63,6 +63,13 @@ RUN apt-get update && apt-get install -y \
# Build profiling # Build profiling
RUN apt-get update && apt-get install -y time && apt-get clean RUN apt-get update && apt-get install -y time && apt-get clean
#================
# Add backport to Debian sources.list and update git to version > 1.7
RUN echo "deb http://http.debian.net/debian wheezy-backports main" \
>/etc/apt/sources.list.d/wheezy-backports.list
RUN apt-get update -qq
RUN apt-get -t wheezy-backports install -y -qq git mercurial
#==================== #====================
# Python dependencies # Python dependencies

@ -43,20 +43,10 @@ chown $(whoami) $XDG_CACHE_HOME
mkdir -p /var/local/git mkdir -p /var/local/git
git clone /var/local/jenkins/grpc /var/local/git/grpc git clone /var/local/jenkins/grpc /var/local/git/grpc
# clone gRPC submodules, use data from locally cloned submodules where possible
# (todo (mattkwong): the /var/local/jenkins/grpc has no submodules and boringssl (cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
# has non-submodule files in it. Figure out how to fix this for local cloning && git submodule update --init --reference /var/local/jenkins/grpc/${name} \
## this prints to console "reports reports.zip" ${name}')
# ls /var/local/jenkins/grpc/third_party/boringssl
## none of these print anything (empty directory)
# ls /var/local/jenkins/grpc/third_party/gflags
# ls /var/local/jenkins/grpc/third_party/googletest
# ls /var/local/jenkins/grpc/third_party/nanopb
# ls /var/local/jenkins/grpc/third_party/protobuf
# ls /var/local/jenkins/grpc/third_party/thrift
# ls /var/local/jenkins/grpc/third_party/zlib
(cd /var/local/git/grpc && git submodule update --init --recursive )
mkdir -p reports mkdir -p reports

Loading…
Cancel
Save