Browse code
do not show errors on make install
When running "make install" in a build container,
docker is not installed the first time it's
run, causing these errors to appear;
$ make install
hack/make/.detect-daemon-osarch: line 11: docker: command not found
hack/make/.detect-daemon-osarch: line 11: docker: command not found
hack/make/.detect-daemon-osarch: line 11: docker: command not found
hack/make/.detect-daemon-osarch: line 11: docker: command not found
KEEPBUNDLE=1 hack/make.sh install-binary
This patch checks if docker exists, and if not
just continues silently :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2017/04/04 22:12:33Showing 1 changed files
| ... | ... |
@@ -2,6 +2,10 @@ |
| 2 | 2 |
set -e |
| 3 | 3 |
|
| 4 | 4 |
docker-version-osarch() {
|
| 5 |
+ if ! type docker &>/dev/null; then |
|
| 6 |
+ # docker is not installed |
|
| 7 |
+ return |
|
| 8 |
+ fi |
|
| 5 | 9 |
local target="$1" # "Client" or "Server" |
| 6 | 10 |
local fmtStr="{{.${target}.Os}}/{{.${target}.Arch}}"
|
| 7 | 11 |
if docker version -f "$fmtStr" 2>/dev/null; then |