diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2747c607ef79..adf534896b04 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -456,11 +456,6 @@ "ImportPath": "github.com/davecgh/go-spew/spew", "Rev": "1aaf839fb07e099361e445273993ccd9adc21b07" }, - { - "ImportPath": "github.com/docker/docker/autogen/dockerversion", - "Comment": "v1.4.1-656-g2115131", - "Rev": "7d2188f9955d3f2002ff8c2e566ef84121de5217" - }, { "ImportPath": "github.com/docker/docker/builder/parser", "Comment": "v1.4.1-656-g2115131", diff --git a/Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go b/Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go deleted file mode 100644 index 817e1e7a4201..000000000000 --- a/Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go +++ /dev/null @@ -1,10 +0,0 @@ -package dockerversion - -var ( - GITCOMMIT = "7d2188f9955d3f2002ff8c2e566ef84121de5217" - VERSION = "1.5" - - IAMSTATIC string // whether or not Docker itself was compiled statically via ./hack/make.sh binary ("true" or not "true") - INITSHA1 string // sha1sum of separate static dockerinit, if Docker itself was compiled dynamically via ./hack/make.sh dynbinary - INITPATH string // custom location to search for a valid dockerinit binary (available for packagers as a last resort escape hatch) -) diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go b/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go index 6e02d369b16c..60f3c0b48f87 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go +++ b/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go @@ -21,7 +21,7 @@ import ( "sync" log "github.com/Sirupsen/logrus" - "github.com/docker/docker/autogen/dockerversion" + //"github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/ioutils" @@ -94,6 +94,10 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and if target == "" { return false } + dockerversion := struct { + IAMSTATIC string + INITSHA1 string + }{"", ""} if dockerversion.IAMSTATIC == "true" { if selfPath == "" { return false @@ -121,6 +125,9 @@ func DockerInitPath(localCopy string) string { // if we're valid, don't bother checking anything else return selfPath } + dockerversion := struct { + INITPATH string + }{""} var possibleInits = []string{ localCopy, dockerversion.INITPATH,