diff options
| author |  Makarand Dharmapurikar <makarandd@google.com> | 2017-03-28 18:34:52 -0700 |
|---|---|---|
| committer | Makarand Dharmapurikar <makarandd@google.com> | 2017-03-28 18:34:52 -0700 |
| commit | 996a6734235ac21cb6a6222425fadc93706c93c3 (patch) | |
| tree | 9da94d69730e6ba09f03c7bc9aaa75771490fe27 /tools/run_tests/dockerize | |
| parent | 0ce1bb03e36e977224d3e6b9e96da5a2ec0847e6 (diff) | |
minor changes to get docker building on osx
docker on osx needs slightly different command line option
Diffstat (limited to 'tools/run_tests/dockerize')
| -rwxr-xr-x | tools/run_tests/dockerize/build_interop_image.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index 48a216a124..3385738f9c 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -71,7 +71,13 @@ then fi # Use image name based on Dockerfile checksum -BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` +# on OSX use md5 instead of sha1sum +if which sha1sum > /dev/null; +then + BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` +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 $? |