1. docker
  2. Commit 7041eb00be7d6224aeedf7db317667b1d121b54d
Browse code

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

This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.

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

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/10/29 08:29:01
Showing 2 changed files
hack/make/dyntest-integration
History View file @ 7041eb0
... ... 
@@ -11,14 +11,8 @@ fi
11 11
12 12 
 (
13 13 
 	export TEST_DOCKERINIT_PATH="$INIT"
14 
-	export LDFLAGS_STATIC_DOCKER=""
15 
-	cat > dockerversion/init.go <<EOF
16 
-// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit
17 
-package dockerversion
18 
-
19 
-func init() {
20 
-	INITSHA1 = "$DOCKER_INITSHA1"
21 
-}
22 
-EOF
14 
+	export LDFLAGS_STATIC_DOCKER="
15 
+		-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
16 
+	"
23 17 
 	source "$(dirname "$BASH_SOURCE")/test-integration"
24 18 
 )
hack/make/dyntest-unit
History View file @ 7041eb0
... ... 
@@ -11,14 +11,8 @@ fi
11 11
12 12 
 (
13 13 
 	export TEST_DOCKERINIT_PATH="$INIT"
14 
-	export LDFLAGS_STATIC_DOCKER=""
15 
-	cat > dockerversion/init.go <<EOF
16 
-// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit
17 
-package dockerversion
18 
-
19 
-func init() {
20 
-	INITSHA1 = "$DOCKER_INITSHA1"
21 
-}
22 
-EOF
14 
+	export LDFLAGS_STATIC_DOCKER="
15 
+		-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
16 
+	"
23 17 
 	source "$(dirname "$BASH_SOURCE")/test-unit"
24 18 
 )