diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-02-23 14:59:45 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-02-23 14:59:45 -0800 |
| commit | 98cdf3b3e61c2e5db5b7b945e471f2c898faab33 (patch) | |
| tree | 48bbffb475c61df53a97bbf96e672b80938af1ba /tools/run_tests/dockerize | |
| parent | 63852c933b4e1ecc9da364fb85baa91d637ec68e (diff) | |
| parent | 5eb24eeaed12f96e49171a77939e23ff2af8680b (diff) | |
Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master
Diffstat (limited to 'tools/run_tests/dockerize')
| -rwxr-xr-x | tools/run_tests/dockerize/build_and_run_docker.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/run_tests/dockerize/build_and_run_docker.sh b/tools/run_tests/dockerize/build_and_run_docker.sh index f52f16ebd6..8c25c861c1 100755 --- a/tools/run_tests/dockerize/build_and_run_docker.sh +++ b/tools/run_tests/dockerize/build_and_run_docker.sh @@ -42,11 +42,18 @@ cd - # 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. +# DOCKER_BASE_IMAGE - If set, pull the latest base image. # $@ - 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\ ) +# Pull the base image to force an update +if [ "$DOCKER_BASE_IMAGE" != "" ] +then + docker pull $DOCKER_BASE_IMAGE +fi + if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME |