|
@@ -5,14 +5,6 @@ DEST=$1
|
|
|
|
|
|
if [ -z "$DOCKER_CLIENTONLY" ]; then
|
|
|
# dockerinit still needs to be a static binary, even if docker is dynamic
|
|
|
- cat > dockerversion/static.go <<EOF
|
|
|
-// AUTOGENERATED FILE; see hack/make/binary and hack/make/dynbinary
|
|
|
-package dockerversion
|
|
|
-
|
|
|
-func init() {
|
|
|
- IAMSTATIC = true
|
|
|
-}
|
|
|
-EOF
|
|
|
go build \
|
|
|
-o "$DEST/dockerinit-$VERSION" \
|
|
|
"${BUILDFLAGS[@]}" \
|
|
@@ -47,17 +39,7 @@ fi
|
|
|
# exported so that "dyntest" can easily access it later without recalculating it
|
|
|
|
|
|
(
|
|
|
- export LDFLAGS_STATIC_DOCKER=""
|
|
|
- cat > dockerversion/init.go <<EOF
|
|
|
-// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit
|
|
|
-package dockerversion
|
|
|
-
|
|
|
-func init() {
|
|
|
- INITSHA1 = "$DOCKER_INITSHA1"
|
|
|
- INITPATH = "$DOCKER_INITPATH"
|
|
|
-}
|
|
|
-EOF
|
|
|
- export IAMSTATIC=false
|
|
|
+ export LDFLAGS_STATIC_DOCKER="-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X $DOCKER_PKG/dockerversion.INITPATH \"$DOCKER_INITPATH\""
|
|
|
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
|
|
|
source "$(dirname "$BASH_SOURCE")/binary"
|
|
|
)
|