diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2016-02-05 12:19:07 -0800 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2016-02-05 14:21:54 -0800 |
commit | 6c857eab57f241741881b8e8696df44506c6a8fc (patch) | |
tree | 6627c7af0726ffed955d9d46004335b8cbb075a2 /tools/jenkins | |
parent | 41208893d4c981659d80cc282b41bc910388a0f5 (diff) |
allow parallel docker run
Diffstat (limited to 'tools/jenkins')
-rwxr-xr-x | tools/jenkins/build_and_run_docker.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/jenkins/build_and_run_docker.sh b/tools/jenkins/build_and_run_docker.sh index b77cd0aebb..92dbbc6f38 100755 --- a/tools/jenkins/build_and_run_docker.sh +++ b/tools/jenkins/build_and_run_docker.sh @@ -37,9 +37,6 @@ cd $(dirname $0)/../.. git_root=$(pwd) cd - -# Create a local branch so the child Docker script won't complain -git branch -f jenkins-docker - # Inputs # DOCKERFILE_DIR - Directory in which Dockerfile file is located. # DOCKER_RUN_SCRIPT - Script to run under docker (relative to grpc repo root) |