diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-27 15:42:18 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-27 15:42:18 -0800 |
| commit | efce38195d612e73e83aff002a74da6a8410cf6a (patch) | |
| tree | 95bf5774123a57a6f0029e2a919d75beee8f817b /tools/jenkins/build_interop_image.sh | |
| parent | 3e301a37bcc1a1d4e34caf2fbb446e4e26e1f8a8 (diff) | |
| parent | e7780a9c7513eadc46f578d42209a96b92a98215 (diff) | |
Merge github.com:grpc/grpc into things_be_slow
Diffstat (limited to 'tools/jenkins/build_interop_image.sh')
| -rwxr-xr-x | tools/jenkins/build_interop_image.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/jenkins/build_interop_image.sh b/tools/jenkins/build_interop_image.sh index 73937068a4..28d5f31d4f 100755 --- a/tools/jenkins/build_interop_image.sh +++ b/tools/jenkins/build_interop_image.sh @@ -71,10 +71,10 @@ then fi # Use image name based on Dockerfile checksum -BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/jenkins/$BASE_NAME/Dockerfile | cut -f1 -d\ ` +BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/dockerfile/$BASE_NAME/Dockerfile | cut -f1 -d\ ` # Make sure base docker image has been built. Should be instantaneous if so. -docker build -t $BASE_IMAGE --force-rm=true tools/jenkins/$BASE_NAME || exit $? +docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/$BASE_NAME || exit $? # Create a local branch so the child Docker script won't complain git branch -f jenkins-docker @@ -92,7 +92,7 @@ CONTAINER_NAME="build_${BASE_NAME}_$(uuidgen)" -v /tmp/ccache:/tmp/ccache \ --name=$CONTAINER_NAME \ $BASE_IMAGE \ - bash -l /var/local/jenkins/grpc/tools/jenkins/$BASE_NAME/build_interop.sh \ + bash -l /var/local/jenkins/grpc/tools/dockerfile/$BASE_NAME/build_interop.sh \ && docker commit $CONTAINER_NAME $INTEROP_IMAGE \ && echo "Successfully built image $INTEROP_IMAGE") EXITCODE=$? |