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

Make Makefile work on OS X

Browse Source 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: df40c61f8ae43349b7504509e8d004f86175c862
Component: engine
This commit is contained in:
Tibor Vass
2016-01-11 18:16:56 -05:00
parent 8e7c65a2dd
commit d54137b176
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/hack/make/.detect-daemon-osarch
+4 -4
View File
@@ -2,17 +2,17 @@
set -e
# Retrieve OS/ARCH of docker daemon, eg. linux/amd64
export DOCKER_ENGINE_OSARCH="$(docker version |tac|tac| awk '
export DOCKER_ENGINE_OSARCH="$(docker version | awk '
$1 == "Client:" { server = 0; next }
$1 == "Server:" { server = 1; next }
server && $1 == "OS/Arch:" { print $2; exit }
server && $1 == "OS/Arch:" { print $2 }
')"
export DOCKER_ENGINE_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
# and the client, just in case
export DOCKER_CLIENT_OSARCH="$(docker version |tac|tac| awk '
export DOCKER_CLIENT_OSARCH="$(docker version | awk '
$1 == "Client:" { client = 1; next }
$1 == "Server:" { client = 0; next }
client && $1 == "OS/Arch:" { print $2; exit }
client && $1 == "OS/Arch:" { print $2 }
')"