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

finally, use code generation for INITSHA1 & INITPATH too 

Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
This commit is contained in:
Michael Hudson-Doyle 2014-10-08 15:31:43 +13:00
parent 85744a35de
commit c7c620dd9f
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ docs/VERSION
docs/GITCOMMIT docs/GITCOMMIT
dockerversion/static.go dockerversion/static.go
dockerversion/details.go dockerversion/details.go
dockerversion/init.go

2
hack/make.sh
View File

@ -94,7 +94,7 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then
DOCKER_BUILDTAGS+=" daemon" DOCKER_BUILDTAGS+=" daemon"
fi fi
rm -f dockerversion/static.go dockerversion/details.go rm -f dockerversion/static.go dockerversion/details.go dockerversion/init.go
cat > dockerversion/details.go <<EOF cat > dockerversion/details.go <<EOF
// AUTOGENERATED FILE; see hack/make.sh // AUTOGENERATED FILE; see hack/make.sh
package dockerversion package dockerversion

11
hack/make/dynbinary
View File

@ -47,7 +47,16 @@ fi
# exported so that "dyntest" can easily access it later without recalculating it # exported so that "dyntest" can easily access it later without recalculating it
( (
export LDFLAGS_STATIC_DOCKER="-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X $DOCKER_PKG/dockerversion.INITPATH \"$DOCKER_INITPATH\"" 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 IAMSTATIC=false
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
source "$(dirname "$BASH_SOURCE")/binary" source "$(dirname "$BASH_SOURCE")/binary"

12
hack/make/dyntest-integration
View File

@ -11,8 +11,14 @@ fi
( (
export TEST_DOCKERINIT_PATH="$INIT" export TEST_DOCKERINIT_PATH="$INIT"
export LDFLAGS_STATIC_DOCKER=" export LDFLAGS_STATIC_DOCKER=""
-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" 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"
}
EOF
source "$(dirname "$BASH_SOURCE")/test-integration" source "$(dirname "$BASH_SOURCE")/test-integration"
) )

12
hack/make/dyntest-unit
View File

@ -11,8 +11,14 @@ fi
( (
export TEST_DOCKERINIT_PATH="$INIT" export TEST_DOCKERINIT_PATH="$INIT"
export LDFLAGS_STATIC_DOCKER=" export LDFLAGS_STATIC_DOCKER=""
-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" 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"
}
EOF
source "$(dirname "$BASH_SOURCE")/test-unit" source "$(dirname "$BASH_SOURCE")/test-unit"
) )