diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-06 20:27:38 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-06 20:27:38 -0800 |
| commit | 385dd9a46294c5230dc22ce587050b30adc5f90f (patch) | |
| tree | acd6a645bacbf4089f83a5b07b0c3a2821830317 /tools/run_tests/dockerize/build_and_run_docker.sh | |
| parent | ddea41e666e2c23a3f1a38e0452e541baa6dddd3 (diff) | |
| parent | 35769dc29c5fd55ccaf8a234d8704fe7dd7c7fdb (diff) | |
Merge branch 'slice_interning' into metadata_filter
Diffstat (limited to 'tools/run_tests/dockerize/build_and_run_docker.sh')
| -rwxr-xr-x | tools/run_tests/dockerize/build_and_run_docker.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/run_tests/dockerize/build_and_run_docker.sh b/tools/run_tests/dockerize/build_and_run_docker.sh index 1ef34b2f96..f52f16ebd6 100755 --- a/tools/run_tests/dockerize/build_and_run_docker.sh +++ b/tools/run_tests/dockerize/build_and_run_docker.sh @@ -41,13 +41,20 @@ cd - # DOCKERFILE_DIR - Directory in which Dockerfile file is located. # DOCKER_RUN_SCRIPT - Script to run under docker (relative to grpc repo root) # OUTPUT_DIR - Directory that will be copied from inside docker after finishing. +# DOCKERHUB_ORGANIZATION - If set, pull a prebuilt image from given dockerhub org. # $@ - Extra args to pass to docker run # Use image name based on Dockerfile location checksum DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ ) -# Make sure docker image has been built. Should be instantaneous if so. -docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR +if [ "$DOCKERHUB_ORGANIZATION" != "" ] +then + DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME + docker pull $DOCKER_IMAGE_NAME +else + # Make sure docker image has been built. Should be instantaneous if so. + docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR +fi # Choose random name for docker container CONTAINER_NAME="build_and_run_docker_$(uuidgen)" |