diff options
author | Brian Goff <cpuguy83@gmail.com> | 2015-10-27 21:19:14 -0400 |
---|---|---|
committer | Brian Goff <cpuguy83@gmail.com> | 2015-10-27 21:23:53 -0400 |
commit | b78ca243d9fc25d81c1b50008ee69f3e71e940f6 (patch) | |
tree | 588494ebbe227ac4250936edc733bbc9845956f2 | |
parent | b96e076af9478f37c5efd3f56e5f0aa42c846b66 (diff) | |
download | docker-b78ca243d9fc25d81c1b50008ee69f3e71e940f6.tar.gz |
Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.
Commit caused issues on systems with case-insensitive filesystems.
Revert for now
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | api/client/hijack.go | 4 | ||||
-rw-r--r-- | api/client/utils.go | 4 | ||||
-rw-r--r-- | api/client/version.go | 8 | ||||
-rw-r--r-- | api/server/middleware.go | 2 | ||||
-rw-r--r-- | api/server/router/local/info.go | 8 | ||||
-rw-r--r-- | daemon/daemon_unix.go | 4 | ||||
-rw-r--r-- | daemon/execdriver/windows/windows.go | 4 | ||||
-rw-r--r-- | daemon/graphdriver/windows/windows.go | 4 | ||||
-rw-r--r-- | daemon/info.go | 6 | ||||
-rw-r--r-- | docker/daemon.go | 8 | ||||
-rw-r--r-- | docker/docker.go | 6 | ||||
-rw-r--r-- | graph/graph.go | 4 | ||||
-rw-r--r-- | graph/graph_test.go | 6 | ||||
-rwxr-xr-x | hack/make.sh | 2 | ||||
-rw-r--r-- | hack/make/.go-autogen | 15 | ||||
-rw-r--r-- | integration-cli/docker_api_version_test.go | 4 | ||||
-rw-r--r-- | integration-cli/docker_cli_config_test.go | 4 | ||||
-rw-r--r-- | registry/registry.go | 6 | ||||
-rw-r--r-- | utils/utils.go | 8 | ||||
-rw-r--r-- | version/version_lib.go | 16 |
21 files changed, 52 insertions, 72 deletions
diff --git a/.gitignore b/.gitignore index 54e7d0d574..017d50aef3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,3 @@ man/man5 man/man8 pyenv vendor/pkg/ -version/version_autogen.go diff --git a/api/client/hijack.go b/api/client/hijack.go index 7908bd6ea5..5b8a23c7ac 100644 --- a/api/client/hijack.go +++ b/api/client/hijack.go @@ -15,9 +15,9 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/term" - "github.com/docker/docker/version" ) type tlsClientCon struct { @@ -152,7 +152,7 @@ func (cli *DockerCli) hijackWithContentType(method, path, contentType string, se req.Header.Set(k, v) } - req.Header.Set("User-Agent", "Docker-Client/"+version.VERSION+" ("+runtime.GOOS+")") + req.Header.Set("User-Agent", "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")") req.Header.Set("Content-Type", contentType) req.Header.Set("Connection", "Upgrade") req.Header.Set("Upgrade", "tcp") diff --git a/api/client/utils.go b/api/client/utils.go index 590649b4df..9eeb0eb045 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -20,6 +20,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api" "github.com/docker/docker/api/types" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/cliconfig" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/signal" @@ -27,7 +28,6 @@ import ( "github.com/docker/docker/pkg/term" "github.com/docker/docker/registry" "github.com/docker/docker/utils" - "github.com/docker/docker/version" ) var ( @@ -77,7 +77,7 @@ func (cli *DockerCli) clientRequest(method, path string, in io.Reader, headers m req.Header.Set(k, v) } - req.Header.Set("User-Agent", "Docker-Client/"+version.VERSION+" ("+runtime.GOOS+")") + req.Header.Set("User-Agent", "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")") req.URL.Host = cli.addr req.URL.Scheme = cli.scheme diff --git a/api/client/version.go b/api/client/version.go index 786857eade..43cde71ec4 100644 --- a/api/client/version.go +++ b/api/client/version.go @@ -7,10 +7,10 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/api/types" + "github.com/docker/docker/autogen/dockerversion" Cli "github.com/docker/docker/cli" flag "github.com/docker/docker/pkg/mflag" "github.com/docker/docker/utils" - "github.com/docker/docker/version" ) var versionTemplate = `Client: @@ -60,11 +60,11 @@ func (cli *DockerCli) CmdVersion(args ...string) (err error) { vd := versionData{ Client: types.Version{ - Version: version.VERSION, + Version: dockerversion.VERSION, APIVersion: api.Version, GoVersion: runtime.Version(), - GitCommit: version.GITCOMMIT, - BuildTime: version.BUILDTIME, + GitCommit: dockerversion.GITCOMMIT, + BuildTime: dockerversion.BUILDTIME, Os: runtime.GOOS, Arch: runtime.GOARCH, Experimental: utils.ExperimentalBuild(), diff --git a/api/server/middleware.go b/api/server/middleware.go index 718d8c3a8c..7581adee58 100644 --- a/api/server/middleware.go +++ b/api/server/middleware.go @@ -11,9 +11,9 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/errors" "github.com/docker/docker/pkg/version" - dockerversion "github.com/docker/docker/version" "golang.org/x/net/context" ) diff --git a/api/server/router/local/info.go b/api/server/router/local/info.go index d916f4d9ff..9b87f5ae7c 100644 --- a/api/server/router/local/info.go +++ b/api/server/router/local/info.go @@ -10,24 +10,24 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/parsers/filters" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/utils" - "github.com/docker/docker/version" "golang.org/x/net/context" ) func (s *router) getVersion(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { v := &types.Version{ - Version: version.VERSION, + Version: dockerversion.VERSION, APIVersion: api.Version, - GitCommit: version.GITCOMMIT, + GitCommit: dockerversion.GITCOMMIT, GoVersion: runtime.Version(), Os: runtime.GOOS, Arch: runtime.GOARCH, - BuildTime: version.BUILDTIME, + BuildTime: dockerversion.BUILDTIME, } version := httputils.VersionFromContext(ctx) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 7fe4f60f1e..c94ea49b52 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -12,6 +12,7 @@ import ( "syscall" "github.com/Sirupsen/logrus" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/graphdriver" derr "github.com/docker/docker/errors" "github.com/docker/docker/pkg/fileutils" @@ -21,7 +22,6 @@ import ( "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" - "github.com/docker/docker/version" "github.com/docker/docker/volume" "github.com/docker/libnetwork" nwconfig "github.com/docker/libnetwork/config" @@ -286,7 +286,7 @@ func migrateIfDownlevel(driver graphdriver.Driver, root string) error { } func configureSysInit(config *Config, rootUID, rootGID int) (string, error) { - localCopy := filepath.Join(config.Root, "init", fmt.Sprintf("dockerinit-%s", version.VERSION)) + localCopy := filepath.Join(config.Root, "init", fmt.Sprintf("dockerinit-%s", dockerversion.VERSION)) sysInitPath := utils.DockerInitPath(localCopy) if sysInitPath == "" { return "", fmt.Errorf("Could not locate dockerinit: This usually means docker was built incorrectly. See https://docs.docker.com/project/set-up-dev-env/ for official build instructions.") diff --git a/daemon/execdriver/windows/windows.go b/daemon/execdriver/windows/windows.go index 9e269c59ea..a1f4f48ae3 100644 --- a/daemon/execdriver/windows/windows.go +++ b/daemon/execdriver/windows/windows.go @@ -8,9 +8,9 @@ import ( "sync" "github.com/Sirupsen/logrus" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/pkg/parsers" - "github.com/docker/docker/version" ) // This is a daemon development variable only and should not be @@ -24,7 +24,7 @@ var forceKill bool // Define name and version for windows var ( DriverName = "Windows 1854" - Version = version.VERSION + " " + version.GITCOMMIT + Version = dockerversion.VERSION + " " + dockerversion.GITCOMMIT ) type activeContainer struct { diff --git a/daemon/graphdriver/windows/windows.go b/daemon/graphdriver/windows/windows.go index 23f9e48552..dbd3defd5c 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -16,6 +16,7 @@ import ( "time" "github.com/Sirupsen/logrus" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/image" "github.com/docker/docker/pkg/archive" @@ -23,7 +24,6 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/random" - "github.com/docker/docker/version" "github.com/microsoft/hcsshim" ) @@ -440,7 +440,7 @@ func (d *Driver) RestoreCustomImages(tagger graphdriver.Tagger, recorder graphdr img := &image.Image{ ID: id, Created: imageData.CreatedTime, - DockerVersion: version.VERSION, + DockerVersion: dockerversion.VERSION, Architecture: runtime.GOARCH, OS: runtime.GOOS, Size: imageData.Size, diff --git a/daemon/info.go b/daemon/info.go index 83be0f0eca..f977f69700 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -7,6 +7,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api/types" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/parsers/operatingsystem" @@ -14,7 +15,6 @@ import ( "github.com/docker/docker/pkg/system" "github.com/docker/docker/registry" "github.com/docker/docker/utils" - "github.com/docker/docker/version" ) // SystemInfo returns information about the host server the daemon is running on. @@ -83,14 +83,14 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { OperatingSystem: operatingSystem, IndexServerAddress: registry.IndexServer, RegistryConfig: daemon.RegistryService.Config, - InitSha1: version.INITSHA1, + InitSha1: dockerversion.INITSHA1, InitPath: initPath, NCPU: runtime.NumCPU(), MemTotal: meminfo.MemTotal, DockerRootDir: daemon.config().Root, Labels: daemon.config().Labels, ExperimentalBuild: utils.ExperimentalBuild(), - ServerVersion: version.VERSION, + ServerVersion: dockerversion.VERSION, ClusterStore: daemon.config().ClusterStore, ClusterAdvertise: daemon.config().ClusterAdvertise, } diff --git a/docker/daemon.go b/docker/daemon.go index d97986a5fb..fb68e70544 100644 --- a/docker/daemon.go +++ b/docker/daemon.go @@ -14,6 +14,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/distribution/uuid" apiserver "github.com/docker/docker/api/server" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/cli" "github.com/docker/docker/cliconfig" "github.com/docker/docker/daemon" @@ -27,7 +28,6 @@ import ( "github.com/docker/docker/pkg/tlsconfig" "github.com/docker/docker/registry" "github.com/docker/docker/utils" - "github.com/docker/docker/version" ) const daemonUsage = " docker daemon [ --help | ... ]\n" @@ -206,7 +206,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error { serverConfig := &apiserver.Config{ Logging: true, - Version: version.VERSION, + Version: dockerversion.VERSION, } serverConfig = setPlatformServerConfig(serverConfig, cli.Config) @@ -279,8 +279,8 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error { logrus.Info("Daemon has completed initialization") logrus.WithFields(logrus.Fields{ - "version": version.VERSION, - "commit": version.GITCOMMIT, + "version": dockerversion.VERSION, + "commit": dockerversion.GITCOMMIT, "execdriver": d.ExecutionDriver().Name(), "graphdriver": d.GraphDriver().String(), }).Info("Docker daemon") diff --git a/docker/docker.go b/docker/docker.go index 90b1e9e4e0..4795b8046d 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -6,12 +6,12 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/api/client" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/cli" flag "github.com/docker/docker/pkg/mflag" "github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/term" "github.com/docker/docker/utils" - "github.com/docker/docker/version" ) func main() { @@ -77,8 +77,8 @@ func main() { func showVersion() { if utils.ExperimentalBuild() { - fmt.Printf("Docker version %s, build %s, experimental\n", version.VERSION, version.GITCOMMIT) + fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.VERSION, dockerversion.GITCOMMIT) } else { - fmt.Printf("Docker version %s, build %s\n", version.VERSION, version.GITCOMMIT) + fmt.Printf("Docker version %s, build %s\n", dockerversion.VERSION, dockerversion.GITCOMMIT) } } diff --git a/graph/graph.go b/graph/graph.go index 8f77f8f6aa..ce84c0c348 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -17,6 +17,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/distribution/digest" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/image" "github.com/docker/docker/pkg/archive" @@ -26,7 +27,6 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/truncindex" "github.com/docker/docker/runconfig" - "github.com/docker/docker/version" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" ) @@ -247,7 +247,7 @@ func (graph *Graph) Create(layerData io.Reader, containerID, containerImage, com ID: stringid.GenerateRandomID(), Comment: comment, Created: time.Now().UTC(), - DockerVersion: version.VERSION, + DockerVersion: dockerversion.VERSION, Author: author, Config: config, Architecture: runtime.GOARCH, diff --git a/graph/graph_test.go b/graph/graph_test.go index ed907440f1..79c2d099a0 100644 --- a/graph/graph_test.go +++ b/graph/graph_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/image" "github.com/docker/docker/pkg/stringid" - "github.com/docker/docker/version" ) func TestMount(t *testing.T) { @@ -106,8 +106,8 @@ func TestGraphCreate(t *testing.T) { if img.Comment != "Testing" { t.Fatalf("Wrong comment: should be '%s', not '%s'", "Testing", img.Comment) } - if img.DockerVersion != version.VERSION { - t.Fatalf("Wrong docker_version: should be '%s', not '%s'", version.VERSION, img.DockerVersion) + if img.DockerVersion != dockerversion.VERSION { + t.Fatalf("Wrong docker_version: should be '%s', not '%s'", dockerversion.VERSION, img.DockerVersion) } images := graph.Map() if l := len(images); l != 1 { diff --git a/hack/make.sh b/hack/make.sh index 854121d17f..c7318953b4 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -146,7 +146,7 @@ fi EXTLDFLAGS_STATIC='-static' # ORIG_BUILDFLAGS is necessary for the cross target which cannot always build # with options like -race. -ORIG_BUILDFLAGS=( -a -tags "autogen netgo static_build sqlite_omit_load_extension $DOCKER_BUILDTAGS" -installsuffix netgo ) +ORIG_BUILDFLAGS=( -a -tags "netgo static_build sqlite_omit_load_extension $DOCKER_BUILDTAGS" -installsuffix netgo ) # see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" ) # Test timeout. diff --git a/hack/make/.go-autogen b/hack/make/.go-autogen index 434976ad94..52e2f571d8 100644 --- a/hack/make/.go-autogen +++ b/hack/make/.go-autogen @@ -2,14 +2,12 @@ rm -rf autogen -cat > version/version_autogen.go <<DVEOF -// +build autogen -// Package version is auto-generated at build-time -package version - -// Default build-time variable for library-import. -// This file is overridden on build with build-time informations. -const ( +mkdir -p autogen/dockerversion +cat > autogen/dockerversion/dockerversion.go <<DVEOF +// AUTOGENERATED FILE; see $BASH_SOURCE +package dockerversion + +var ( GITCOMMIT string = "$GITCOMMIT" VERSION string = "$VERSION" BUILDTIME string = "$BUILDTIME" @@ -18,7 +16,6 @@ const ( INITSHA1 string = "$DOCKER_INITSHA1" INITPATH string = "$DOCKER_INITPATH" ) -// AUTOGENERATED FILE; see $BASH_SOURCE DVEOF # Compile the Windows resources into the sources diff --git a/integration-cli/docker_api_version_test.go b/integration-cli/docker_api_version_test.go index e148b7af79..69bf6b1552 100644 --- a/integration-cli/docker_api_version_test.go +++ b/integration-cli/docker_api_version_test.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/docker/docker/api/types" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/integration/checker" - "github.com/docker/docker/version" "github.com/go-check/check" ) @@ -19,5 +19,5 @@ func (s *DockerSuite) TestGetVersion(c *check.C) { c.Assert(json.Unmarshal(body, &v), checker.IsNil) - c.Assert(v.Version, checker.Equals, version.VERSION, check.Commentf("Version mismatch")) + c.Assert(v.Version, checker.Equals, dockerversion.VERSION, check.Commentf("Version mismatch")) } diff --git a/integration-cli/docker_cli_config_test.go b/integration-cli/docker_cli_config_test.go index 106533b5d0..8c66c7b53e 100644 --- a/integration-cli/docker_cli_config_test.go +++ b/integration-cli/docker_cli_config_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "runtime" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/integration/checker" - "github.com/docker/docker/version" "github.com/go-check/check" ) @@ -54,7 +54,7 @@ func (s *DockerSuite) TestConfigHttpHeader(c *check.C) { c.Assert(headers["User-Agent"], checker.NotNil, check.Commentf("Missing User-Agent")) - c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+version.VERSION+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out)) + c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out)) c.Assert(headers["Myheader"], checker.NotNil) c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("Missing/bad header,out:%v", out)) diff --git a/registry/registry.go b/registry/registry.go index 1631023567..389bd959df 100644 --- a/registry/registry.go +++ b/registry/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()}) } diff --git a/utils/utils.go b/utils/utils.go index a1928fe593..a17ab9dcea 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -14,10 +14,10 @@ import ( "strings" "github.com/docker/distribution/registry/api/errcode" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/stringid" - "github.com/docker/docker/version" ) // SelfPath figures out the absolute path of our own binary (if it's still around). @@ -60,7 +60,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and if target == "" { return false } - if version.IAMSTATIC == "true" { + if dockerversion.IAMSTATIC == "true" { if selfPath == "" { return false } @@ -77,7 +77,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and } return os.SameFile(targetFileInfo, selfPathFileInfo) } - return version.INITSHA1 != "" && dockerInitSha1(target) == version.INITSHA1 + return dockerversion.INITSHA1 != "" && dockerInitSha1(target) == dockerversion.INITSHA1 } // DockerInitPath figures out the path of our dockerinit (which may be SelfPath()) @@ -89,7 +89,7 @@ func DockerInitPath(localCopy string) string { } var possibleInits = []string{ localCopy, - version.INITPATH, + dockerversion.INITPATH, filepath.Join(filepath.Dir(selfPath), "dockerinit"), // FHS 3.0 Draft: "/usr/libexec includes internal binaries that are not intended to be executed directly by users or shell scripts. Applications may use a single subdirectory under /usr/libexec." diff --git a/version/version_lib.go b/version/version_lib.go deleted file mode 100644 index 3b44cd2c9b..0000000000 --- a/version/version_lib.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build !autogen - -// Package version is auto-generated at build-time -package version - -// Default build-time variable for library-import. -// This file is overridden on build with build-time informations. -const ( - GITCOMMIT string = "library-import" - VERSION string = "library-import" - BUILDTIME string = "library-import" - - IAMSTATIC string = "library-import" - INITSHA1 string = "library-import" - INITPATH string = "library-import" -) |