diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
| commit | 4e9265c828f0b559b5fdba04913fed46bf771399 (patch) | |
| tree | 4a379fc2bdc037753cf8d81f8b86327e4bc50a42 /tools/run_tests/dockerize | |
| parent | 0ee7574732a06e8cace4e099a678f4bd5dbff679 (diff) | |
| parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) | |
Merge with master
Diffstat (limited to 'tools/run_tests/dockerize')
| -rwxr-xr-x | tools/run_tests/dockerize/build_and_run_docker.sh | 4 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/build_docker_and_run_tests.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/build_interop_image.sh | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/tools/run_tests/dockerize/build_and_run_docker.sh b/tools/run_tests/dockerize/build_and_run_docker.sh index 80aec82c3d..323c2f78af 100755 --- a/tools/run_tests/dockerize/build_and_run_docker.sh +++ b/tools/run_tests/dockerize/build_and_run_docker.sh @@ -36,13 +36,13 @@ DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfi # Pull the base image to force an update if [ "$DOCKER_BASE_IMAGE" != "" ] then - docker pull $DOCKER_BASE_IMAGE + time docker pull $DOCKER_BASE_IMAGE fi if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME - docker pull $DOCKER_IMAGE_NAME + time 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 diff --git a/tools/run_tests/dockerize/build_docker_and_run_tests.sh b/tools/run_tests/dockerize/build_docker_and_run_tests.sh index eea00da821..06a5dae6a5 100755 --- a/tools/run_tests/dockerize/build_docker_and_run_tests.sh +++ b/tools/run_tests/dockerize/build_docker_and_run_tests.sh @@ -40,7 +40,7 @@ DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfi if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME - docker pull $DOCKER_IMAGE_NAME + time 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 diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index 9d8ad5325c..dbc6bdeea5 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -48,6 +48,14 @@ else echo "WARNING: grpc-go not found, it won't be mounted to the docker container." fi +echo "GRPC_NODE_ROOT: ${GRPC_NODE_ROOT:=$(cd ../grpc-node && pwd)}" +if [ -n "$GRPC_NODE_ROOT" ] +then + MOUNT_ARGS+=" -v $GRPC_NODE_ROOT:/var/local/jenkins/grpc-node:ro" +else + echo "WARNING: grpc-node not found, it won't be mounted to the docker container." +fi + mkdir -p /tmp/ccache # Mount service account dir if available. @@ -70,7 +78,7 @@ fi if [ "$DOCKERHUB_ORGANIZATION" != "" ] then BASE_IMAGE=$DOCKERHUB_ORGANIZATION/$BASE_IMAGE - docker pull $BASE_IMAGE + time docker pull $BASE_IMAGE 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 $? |