aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/jenkins
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-05 13:53:47 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-05 14:48:10 -0800
commitb5f7397b08de46e5241f7bcf74a4662917a42c0d (patch)
tree9ceffc9b40af9d5e5162fdbcbafef36e8590fa36 /tools/jenkins
parent92711bbc1271691e9593ee2fd5a7ad27288baa0a (diff)
cleanup distribtest Dockerimages
Diffstat (limited to 'tools/jenkins')
-rwxr-xr-xtools/jenkins/docker_run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/jenkins/docker_run.sh b/tools/jenkins/docker_run.sh
index 6fbae40ac2..519dc5cade 100755
--- a/tools/jenkins/docker_run.sh
+++ b/tools/jenkins/docker_run.sh
@@ -31,7 +31,7 @@
# This script is invoked by build_docker_* inside a docker
# container. You should never need to call this script on your own.
-set -e
+set -ex
if [ "$RELATIVE_COPY_PATH" == "" ]
then
@@ -39,7 +39,7 @@ then
git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc
else
mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH"
- cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH/*" "/var/local/git/grpc/$RELATIVE_COPY_PATH"
+ cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH"
fi
if [ -x "$(command -v rvm)" ]