toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

dockerversion placeholder for library-import

Browse Source 
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
This commit is contained in:
Vincent Demeester
2015-10-25 19:18:23 +01:00
parent 9b6c8de881
commit 4d261096ec
21 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/docker/daemon.go
View File

@ -14,7 +14,6 @@ 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"
@ -28,6 +27,7 @@ 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: dockerversion.VERSION,
Version: version.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": dockerversion.VERSION,
"commit": dockerversion.GITCOMMIT,
"version": version.VERSION,
"commit": version.GITCOMMIT,
"execdriver": d.ExecutionDriver().Name(),
"graphdriver": d.GraphDriver().String(),
}).Info("Docker daemon")

6
components/engine/docker/docker.go
View File

@ -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", dockerversion.VERSION, dockerversion.GITCOMMIT)
fmt.Printf("Docker version %s, build %s, experimental\n", version.VERSION, version.GITCOMMIT)
} else {
fmt.Printf("Docker version %s, build %s\n", dockerversion.VERSION, dockerversion.GITCOMMIT)
fmt.Printf("Docker version %s, build %s\n", version.VERSION, version.GITCOMMIT)
}
}