From ae3c7dec3b075a263da8d1e1cc510275b281e799 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Tue, 11 Feb 2014 16:05:45 -0800
Subject: [PATCH] Move docker version introspection to a sub-package.

This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
---
 commands.go                    |  5 -----
 docker/docker.go               | 12 +++---------
 dockerversion/dockerversion.go | 11 +++++++++++
 hack/make.sh                   |  2 +-
 version.go                     |  9 +++++++++
 5 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 dockerversion/dockerversion.go

diff --git a/commands.go b/commands.go
index cc019f8c10..55cb3e21c7 100644
--- a/commands.go
+++ b/commands.go
@@ -38,11 +38,6 @@ import (
 	"time"
 )
 
-var (
-	GITCOMMIT string
-	VERSION   string
-)
-
 var (
 	ErrConnectionRefused = errors.New("Can't connect to docker daemon. Is 'docker -d' running on this host?")
 )
diff --git a/docker/docker.go b/docker/docker.go
index d92f4d98ea..df99a20450 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -8,17 +8,13 @@ import (
 
 	"github.com/dotcloud/docker"
 	"github.com/dotcloud/docker/api"
+	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"
 	flag "github.com/dotcloud/docker/pkg/mflag"
 	"github.com/dotcloud/docker/sysinit"
 	"github.com/dotcloud/docker/utils"
 )
 
-var (
-	GITCOMMIT string
-	VERSION   string
-)
-
 func main() {
 	if selfPath := utils.SelfPath(); selfPath == "/sbin/init" || selfPath == "/.dockerinit" {
 		// Running in init mode
@@ -71,8 +67,6 @@ func main() {
 	if *flDebug {
 		os.Setenv("DEBUG", "1")
 	}
-	docker.GITCOMMIT = GITCOMMIT
-	docker.VERSION = VERSION
 	if *flDaemon {
 		if flag.NArg() != 0 {
 			flag.Usage()
@@ -104,7 +98,7 @@ func main() {
 		job = eng.Job("serveapi", flHosts.GetAll()...)
 		job.SetenvBool("Logging", true)
 		job.SetenvBool("EnableCors", *flEnableCors)
-		job.Setenv("Version", VERSION)
+		job.Setenv("Version", dockerversion.VERSION)
 		if err := job.Run(); err != nil {
 			log.Fatal(err)
 		}
@@ -126,5 +120,5 @@ func main() {
 }
 
 func showVersion() {
-	fmt.Printf("Docker version %s, build %s\n", VERSION, GITCOMMIT)
+	fmt.Printf("Docker version %s, build %s\n", dockerversion.VERSION, dockerversion.GITCOMMIT)
 }
diff --git a/dockerversion/dockerversion.go b/dockerversion/dockerversion.go
new file mode 100644
index 0000000000..1872691ed2
--- /dev/null
+++ b/dockerversion/dockerversion.go
@@ -0,0 +1,11 @@
+package dockerversion
+
+// FIXME: this should be embedded in the docker/docker.go,
+// but we can't because distro policy requires us to
+// package a separate dockerinit binary, and that binary needs
+// to know its version too.
+
+var (
+	GITCOMMIT string
+	VERSION   string
+)
diff --git a/hack/make.sh b/hack/make.sh
index d73b33a4fa..011b796201 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -82,7 +82,7 @@ if [ ! "$GOPATH" ]; then
 fi
 
 # Use these flags when compiling the tests and final binary
-LDFLAGS='-X main.GITCOMMIT "'$GITCOMMIT'" -X main.VERSION "'$VERSION'" -w'
+LDFLAGS='-X github.com/dotcloud/docker/dockerversion.GITCOMMIT "'$GITCOMMIT'" -X github.com/dotcloud/docker/dockerversion.VERSION "'$VERSION'" -w'
 LDFLAGS_STATIC='-X github.com/dotcloud/docker/utils.IAMSTATIC true -linkmode external -extldflags "-lpthread -static -Wl,--unresolved-symbols=ignore-in-object-files"'
 BUILDFLAGS='-tags netgo -a'
 
diff --git a/version.go b/version.go
index a4288245f7..2eee68c2f2 100644
--- a/version.go
+++ b/version.go
@@ -1,11 +1,20 @@
 package docker
 
 import (
+	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/utils"
 	"runtime"
 )
 
+var (
+	// FIXME: this is a convenience indirection to preserve legacy
+	// code. It can be removed by using dockerversion.VERSION and
+	// dockerversion.GITCOMMIT directly
+	GITCOMMIT string = dockerversion.GITCOMMIT
+	VERSION   string = dockerversion.VERSION
+)
+
 func init() {
 	engine.Register("version", jobVersion)
 }