diff options
author | Vincent Demeester <vincent@sbr.pm> | 2015-11-09 19:32:46 +0100 |
---|---|---|
committer | Vincent Demeester <vincent@sbr.pm> | 2015-11-09 19:32:46 +0100 |
commit | 8054a303870b81eebe05e38261c1b68197b68558 (patch) | |
tree | 2f1dc19ef6f694a453ccb2a25a303d988dd4cde0 /registry/registry.go | |
parent | 1eafc7264cd4e2d4acd9944683326234f06ec9ef (diff) | |
download | docker-8054a303870b81eebe05e38261c1b68197b68558.tar.gz |
dockerversion placeholder for library import
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'registry/registry.go')
-rw-r--r-- | registry/registry.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/registry/registry.go b/registry/registry.go index f93811e6ba..e8eb478572 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -20,7 +20,7 @@ import ( "github.com/docker/distribution/registry/api/v2" "github.com/docker/distribution/registry/client" "github.com/docker/distribution/registry/client/transport" - "github.com/docker/docker/autogen/dockerversion" + "github.com/docker/docker/dockerversion" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/tlsconfig" "github.com/docker/docker/pkg/useragent" @@ -39,9 +39,9 @@ var dockerUserAgent string func init() { httpVersion := make([]useragent.VersionInfo, 0, 6) - httpVersion = append(httpVersion, useragent.VersionInfo{Name: "docker", Version: dockerversion.VERSION}) + httpVersion = append(httpVersion, useragent.VersionInfo{Name: "docker", Version: dockerversion.Version}) httpVersion = append(httpVersion, useragent.VersionInfo{Name: "go", Version: runtime.Version()}) - httpVersion = append(httpVersion, useragent.VersionInfo{Name: "git-commit", Version: dockerversion.GITCOMMIT}) + httpVersion = append(httpVersion, useragent.VersionInfo{Name: "git-commit", Version: dockerversion.GitCommit}) if kernelVersion, err := kernel.GetKernelVersion(); err == nil { httpVersion = append(httpVersion, useragent.VersionInfo{Name: "kernel", Version: kernelVersion.String()}) } |