Pull from dockerhub.

pull/11790/head
Adele Zhou 8 years ago
parent 519318f752
commit e2810d2f53
  1. 10
      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\ ` BASE_IMAGE=${BASE_NAME}_base:`md5 -r tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ `
fi fi
# Make sure base docker image has been built. Should be instantaneous if so. if [ "$DOCKERHUB_ORGANIZATION" != "" ]
docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $? 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 # Create a local branch so the child Docker script won't complain
git branch -f jenkins-docker git branch -f jenkins-docker

Loading…
Cancel
Save