diff options
Diffstat (limited to 'grpc/tools/run_tests/dockerize/build_and_run_docker.sh')
| -rwxr-xr-x | grpc/tools/run_tests/dockerize/build_and_run_docker.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/grpc/tools/run_tests/dockerize/build_and_run_docker.sh b/grpc/tools/run_tests/dockerize/build_and_run_docker.sh index 7e9bc774..3f129ce0 100755 --- a/grpc/tools/run_tests/dockerize/build_and_run_docker.sh +++ b/grpc/tools/run_tests/dockerize/build_and_run_docker.sh @@ -29,18 +29,11 @@ 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 - time docker pull "$DOCKER_BASE_IMAGE" -fi - if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME @@ -65,7 +58,12 @@ docker run \ -e "KOKORO_BUILD_NUMBER=$KOKORO_BUILD_NUMBER" \ -e "KOKORO_BUILD_URL=$KOKORO_BUILD_URL" \ -e "KOKORO_JOB_NAME=$KOKORO_JOB_NAME" \ + -e "KOKORO_ARTIFACTS_DIR=$KOKORO_ARTIFACTS_DIR" \ + -e "GIT_ORIGIN_URL=$(git -C $git_root remote get-url origin)" \ + -e "GIT_COMMIT_SHORT=$(git -C $git_root rev-parse --short HEAD)" \ + -e "TESTGRID_EXCLUDE=$TESTGRID_EXCLUDE" \ -v "$git_root:/var/local/jenkins/grpc:ro" \ + -v "$KOKORO_ARTIFACTS_DIR:$KOKORO_ARTIFACTS_DIR" \ -w /var/local/git/grpc \ --name="$CONTAINER_NAME" \ $EXTRA_DOCKER_ARGS \ |