toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not show errors on make install

Browse Source 
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>
Upstream-commit: 2443decdd5eb016ca2eb9448c033ed2b9887ef2a
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-04-04 15:19:50 +02:00
parent bc0cac1b3a
commit 320a24cf4b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/make/.detect-daemon-osarch
+4
View File
@@ -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