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

Revert "finally, use code generation for INITSHA1 & INITPATH too" 

This reverts commit c7c620dd9f.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle 2014-10-28 16:29:01 -07:00
parent ec1420cc2b
commit 7041eb00be
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/make/dyntest-integration
View File

@ -11,14 +11,8 @@ fi
( (
export TEST_DOCKERINIT_PATH="$INIT" export TEST_DOCKERINIT_PATH="$INIT"
export LDFLAGS_STATIC_DOCKER="" export LDFLAGS_STATIC_DOCKER="
cat > dockerversion/init.go <<EOF -X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
// 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,14 +11,8 @@ fi
( (
export TEST_DOCKERINIT_PATH="$INIT" export TEST_DOCKERINIT_PATH="$INIT"
export LDFLAGS_STATIC_DOCKER="" export LDFLAGS_STATIC_DOCKER="
cat > dockerversion/init.go <<EOF -X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
// 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"
) )