docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19247 from tiborvass/remove-tac 

Make Makefile work on OS X
This commit is contained in:
Tibor Vass 2016-01-11 19:13:55 -05:00
parent a96a0b3781 df40c61f8a
commit 058e6dce18
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/make/.detect-daemon-osarch
View File

@ -2,17 +2,17 @@
set -e set -e
# Retrieve OS/ARCH of docker daemon, eg. linux/amd64 # 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 == "Client:" { server = 0; next }
$1 == "Server:" { server = 1; 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_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}" export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
# and the client, just in case # 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 == "Client:" { client = 1; next }
$1 == "Server:" { client = 0; next } $1 == "Server:" { client = 0; next }
client && $1 == "OS/Arch:" { print $2; exit } client && $1 == "OS/Arch:" { print $2 }
')" ')"