diff options
| author |  Sam Guymer <sam@guymer.me> | 2016-09-06 18:18:09 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-09-07 10:35:06 +0000 |
| commit | 87463e7c4006880b6939fbc07cfb5556260c39fb (patch) | |
| tree | ac4ce6f1a64bf2ff7e8cb175d2cd880ae53ab9c0 /tools/build_defs | |
| parent | 86a40472a490e8cc8b1793db17b012b0fc21cd23 (diff) | |
Fix docker_build() run when using Docker < 1.8
The docker version command does not have a format flag until Docker 1.8,
so if it exits with a non zero exit code default to Docker version 1.5
instead of 1.10.
--
Change-Id: I971bb0d8d0108e4bb6076710be5e9dfe1893e472
Reviewed-on: https://bazel-review.googlesource.com/#/c/5771
MOS_MIGRATED_REVID=132341532
Diffstat (limited to 'tools/build_defs')
| -rw-r--r-- | tools/build_defs/docker/incremental_load.sh.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build_defs/docker/incremental_load.sh.tpl b/tools/build_defs/docker/incremental_load.sh.tpl index 50ce4dbd34..a563b9dc22 100644 --- a/tools/build_defs/docker/incremental_load.sh.tpl +++ b/tools/build_defs/docker/incremental_load.sh.tpl @@ -23,7 +23,7 @@ RUNFILES="${PYTHON_RUNFILES:-${BASH_SOURCE[0]}.runfiles}" DOCKER="${DOCKER:-docker}" FULL_DOCKER_VERSION=$(docker version -f {{.Server.Version}} 2> /dev/null \ - || echo "1.10.0") + || echo "1.5.0") DOCKER_MAJOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | sed -r 's#^([0-9]+)\..*#\1#') DOCKER_MINOR_VERSION=$(echo "$FULL_DOCKER_VERSION" | sed -r 's#^[0-9]+\.([0-9]+).*#\1#') if [ "$DOCKER_MAJOR_VERSION" -eq "1" ] && [ "$DOCKER_MINOR_VERSION" -lt "10" ]; then |