From 2443decdd5eb016ca2eb9448c033ed2b9887ef2a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 4 Apr 2017 15:12:33 +0200 Subject: [PATCH] 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 --- hack/make/.detect-daemon-osarch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/make/.detect-daemon-osarch b/hack/make/.detect-daemon-osarch index efa3be5e9d..ac16055fcf 100644 --- a/hack/make/.detect-daemon-osarch +++ b/hack/make/.detect-daemon-osarch @@ -2,6 +2,10 @@ set -e docker-version-osarch() { + if ! type docker &>/dev/null; then + # docker is not installed + return + fi local target="$1" # "Client" or "Server" local fmtStr="{{.${target}.Os}}/{{.${target}.Arch}}" if docker version -f "$fmtStr" 2>/dev/null; then