aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/interoptest/grpc_interop_php7
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-10-12 12:09:37 +0200
committerGravatar GitHub <noreply@github.com>2016-10-12 12:09:37 +0200
commit53cba4a153f3e291f1b10015d1686f4f194cda7b (patch)
tree47d5928548bfab5cc3e0fd02a9990a4714013140 /tools/dockerfile/interoptest/grpc_interop_php7
parent352e9a3e28627e6d7c106edc35c77205a301428d (diff)
parent41c06a2ed563e31add33212dd861f554fc426c2b (diff)
Merge pull request #8182 from matt-kwong/fix_docker_local_clone
Fixed local cloning of grpc/grpc submodules on docker
Diffstat (limited to 'tools/dockerfile/interoptest/grpc_interop_php7')
-rwxr-xr-xtools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
index 87cb0fe4b2..fccca4d695 100755
--- a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
@@ -32,7 +32,11 @@
set -ex
mkdir -p /var/local/git
-git clone --recursive /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
+(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \
+&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \
+${name}')
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true