docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #5540 from unclejack/imports_cleanup

Browse Source 
Upstream-commit: d2a41b38c52a679b997f889b46a460231b983e81
Component: engine
This commit is contained in:
Solomon Hykes
2014-05-09 00:30:14 -07:00
parent 92a6d709bd 90fcda8544
commit f0b524c32c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/client/commands.go
View File

@@ -13,7 +13,7 @@ import (
"os"
"os/exec"
"path"
goruntime "runtime"
"runtime"
"strconv"
"strings"
"syscall"
@@ -359,7 +359,7 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
fmt.Fprintf(cli.out, "Client version: %s\n", dockerversion.VERSION)
}
fmt.Fprintf(cli.out, "Client API version: %s\n", api.APIVERSION)
fmt.Fprintf(cli.out, "Go version (client): %s\n", goruntime.Version())
fmt.Fprintf(cli.out, "Go version (client): %s\n", runtime.Version())
if dockerversion.GITCOMMIT != "" {
fmt.Fprintf(cli.out, "Git commit (client): %s\n", dockerversion.GITCOMMIT)
}

4
components/engine/integration/runtime_test.go
View File

@@ -16,7 +16,7 @@ import (
"net/url"
"os"
"path/filepath"
goruntime "runtime"
"runtime"
"strconv"
"strings"
"syscall"
@@ -127,7 +127,7 @@ func init() {
spawnGlobalDaemon()
spawnLegitHttpsDaemon()
spawnRogueHttpsDaemon()
startFds, startGoroutines = utils.GetTotalUsedFds(), goruntime.NumGoroutine()
startFds, startGoroutines = utils.GetTotalUsedFds(), runtime.NumGoroutine()
}
func setupBaseImage() {

10
components/engine/server/server.go
View File

@@ -34,7 +34,7 @@ import (
gosignal "os/signal"
"path"
"path/filepath"
goruntime "runtime"
"runtime"
"strconv"
"strings"
"sync"
@@ -789,7 +789,7 @@ func (srv *Server) DockerInfo(job *engine.Job) engine.Status {
v.SetBool("IPv4Forwarding", !srv.daemon.SystemConfig().IPv4ForwardingDisabled)
v.SetBool("Debug", os.Getenv("DEBUG") != "")
v.SetInt("NFd", utils.GetTotalUsedFds())
v.SetInt("NGoroutines", goruntime.NumGoroutine())
v.SetInt("NGoroutines", runtime.NumGoroutine())
v.Set("ExecutionDriver", srv.daemon.ExecutionDriver().Name())
v.SetInt("NEventsListener", len(srv.listeners))
v.Set("KernelVersion", kernelVersion)
@@ -807,9 +807,9 @@ func (srv *Server) DockerVersion(job *engine.Job) engine.Status {
v.Set("Version", dockerversion.VERSION)
v.SetJson("ApiVersion", api.APIVERSION)
v.Set("GitCommit", dockerversion.GITCOMMIT)
v.Set("GoVersion", goruntime.Version())
v.Set("Os", goruntime.GOOS)
v.Set("Arch", goruntime.GOARCH)
v.Set("GoVersion", runtime.Version())
v.Set("Os", runtime.GOOS)
v.Set("Arch", runtime.GOARCH)
if kernelVersion, err := utils.GetKernelVersion(); err == nil {
v.Set("KernelVersion", kernelVersion.String())
}