diff options
| author |  Ken Payson <kpayson@google.com> | 2017-02-17 22:52:27 -0800 |
|---|---|---|
| committer | Ken Payson <kpayson@google.com> | 2017-02-22 18:43:10 -0800 |
| commit | 626fb455acb45f200a1b933fb63d610b42fb198b (patch) | |
| tree | ea245f6eaf66bc510ed56d255a0818949c7cbf2c /tools/run_tests/dockerize | |
| parent | bb3edafea245a9780cc4c10f0b58da21e8193f38 (diff) | |
Add Python3.6 to build artifacts
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 |