mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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:
parent
ec1420cc2b
commit
7041eb00be
2 changed files with 6 additions and 18 deletions
|
@ -11,14 +11,8 @@ fi
|
|||
|
||||
(
|
||||
export TEST_DOCKERINIT_PATH="$INIT"
|
||||
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"
|
||||
}
|
||||
EOF
|
||||
export LDFLAGS_STATIC_DOCKER="
|
||||
-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
|
||||
"
|
||||
source "$(dirname "$BASH_SOURCE")/test-integration"
|
||||
)
|
||||
|
|
|
@ -11,14 +11,8 @@ fi
|
|||
|
||||
(
|
||||
export TEST_DOCKERINIT_PATH="$INIT"
|
||||
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"
|
||||
}
|
||||
EOF
|
||||
export LDFLAGS_STATIC_DOCKER="
|
||||
-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
|
||||
"
|
||||
source "$(dirname "$BASH_SOURCE")/test-unit"
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue