diff options
| author |  adelez <adelez@google.com> | 2017-07-13 10:04:54 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-13 10:04:54 -0700 |
| commit | a61a2ac3304739147a7442936c2f45ccdf2274a2 (patch) | |
| tree | f688e20e6e1375e100c4f7626e90a1726df45bda | |
| parent | 1a984a559065ac6214bdff75ee75a3a21f3b8644 (diff) | |
| parent | e2810d2f53994ca18858cd4eae2e5022681b5da9 (diff) | |
Merge pull request #11790 from adelez/ci2
Change ci script permission and pull from dockerhub
| -rwxr-xr-x[-rw-r--r--] | tools/internal_ci/linux/grpc_interop_toprod.sh | 0 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/build_interop_image.sh | 10 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/internal_ci/linux/grpc_interop_toprod.sh b/tools/internal_ci/linux/grpc_interop_toprod.sh index 3d06185406..3d06185406 100644..100755 --- a/tools/internal_ci/linux/grpc_interop_toprod.sh +++ b/tools/internal_ci/linux/grpc_interop_toprod.sh diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index fa631851b1..61105b0da4 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -67,8 +67,14 @@ else BASE_IMAGE=${BASE_NAME}_base:`md5 -r tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` fi -# Make sure base docker image has been built. Should be instantaneous if so. -docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $? +if [ "$DOCKERHUB_ORGANIZATION" != "" ] +then + DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$BASE_IMAGE + docker pull $DOCKER_IMAGE_NAME +else + # Make sure docker image has been built. Should be instantaneous if so. + docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $? +fi # Create a local branch so the child Docker script won't complain git branch -f jenkins-docker |