From 24de26a805ba4fa1c583d3742cfe19f93751fc5c Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 27 Oct 2015 21:19:14 -0400 Subject: [PATCH] Revert "dockerversion placeholder for library-import" This reverts commit c2d5c29437cd11e1a01cc2c574e02ed9865eb647. Commit caused issues on systems with case-insensitive filesystems. Revert for now Signed-off-by: Brian Goff --- docs/registry.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/registry.go b/docs/registry.go index 163102356..389bd959d 100644 --- a/docs/registry.go +++ b/docs/registry.go @@ -20,10 +20,10 @@ 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/pkg/parsers/kernel" "github.com/docker/docker/pkg/tlsconfig" "github.com/docker/docker/pkg/useragent" - "github.com/docker/docker/version" ) var ( @@ -39,9 +39,9 @@ var dockerUserAgent string func init() { httpVersion := make([]useragent.VersionInfo, 0, 6) - httpVersion = append(httpVersion, useragent.VersionInfo{"docker", version.VERSION}) + httpVersion = append(httpVersion, useragent.VersionInfo{"docker", dockerversion.VERSION}) httpVersion = append(httpVersion, useragent.VersionInfo{"go", runtime.Version()}) - httpVersion = append(httpVersion, useragent.VersionInfo{"git-commit", version.GITCOMMIT}) + httpVersion = append(httpVersion, useragent.VersionInfo{"git-commit", dockerversion.GITCOMMIT}) if kernelVersion, err := kernel.GetKernelVersion(); err == nil { httpVersion = append(httpVersion, useragent.VersionInfo{"kernel", kernelVersion.String()}) }