beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tweak hack/make/*-{client,daemon} to be consistent

Browse source 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi 2016-04-25 10:40:07 -07:00
parent e974eadd94
commit 626d25a7d9
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hack/make/binary-client
View file

@ -1,7 +1,8 @@
#!/bin/bash
set -e
BINARY_SHORT_NAME="docker"
SOURCE_PATH="./client"
source "${MAKEDIR}/.binary"
(
export BINARY_SHORT_NAME='docker'
export SOURCE_PATH='./client'
source "${MAKEDIR}/.binary"
)

11
hack/make/binary-daemon
View file

@ -1,8 +1,9 @@
#!/bin/bash
set -e
BINARY_SHORT_NAME="dockerd"
SOURCE_PATH="./docker"
source "${MAKEDIR}/.binary"
copy_containerd "$DEST" "hash"
(
export BINARY_SHORT_NAME='dockerd'
export SOURCE_PATH='./docker'
source "${MAKEDIR}/.binary"
copy_containerd "$DEST" 'hash'
)

6
hack/make/dynbinary-client
View file

@ -2,9 +2,9 @@
set -e
(
export BINARY_SHORT_NAME="docker"
export SOURCE_PATH="./client"
export IAMSTATIC="false"
export BINARY_SHORT_NAME='docker'
export SOURCE_PATH='./client'
export IAMSTATIC='false'
export LDFLAGS_STATIC_DOCKER=''
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here

6
hack/make/dynbinary-daemon
View file

@ -2,9 +2,9 @@
set -e
(
export BINARY_SHORT_NAME="dockerd"
export SOURCE_PATH="./docker"
export IAMSTATIC="false"
export BINARY_SHORT_NAME='dockerd'
export SOURCE_PATH='./docker'
export IAMSTATIC='false'
export LDFLAGS_STATIC_DOCKER=''
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here