Merge pull request #1102 from ZouRui89/info_add

feature: add image proxy info in 'pouch info'
AliyunContainerService · Apr 12, 2018 · 2bd68f2 · 2bd68f2
2 parents 6a70012 + a495a6b
commit 2bd68f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cli/info.go b/cli/info.go
@@ -55,9 +55,9 @@ func (v *InfoCommand) runInfo() error {
 
 func prettyPrintInfo(cli *Cli, info *types.SystemInfo) error {
 	fmt.Fprintln(os.Stdout, "Containers:", info.Containers)
-	fmt.Fprintln(os.Stdout, "Running:", info.ContainersRunning)
-	fmt.Fprintln(os.Stdout, "Paused:", info.ContainersPaused)
-	fmt.Fprintln(os.Stdout, "Stopped:", info.ContainersStopped)
+	fmt.Fprintln(os.Stdout, " Running:", info.ContainersRunning)
+	fmt.Fprintln(os.Stdout, " Paused:", info.ContainersPaused)
+	fmt.Fprintln(os.Stdout, " Stopped:", info.ContainersStopped)
 	fmt.Fprintln(os.Stdout, "Images: ", info.Images)
 	fmt.Fprintln(os.Stdout, "ID:", info.ID)
 	fmt.Fprintln(os.Stdout, "Name:", info.Name)
@@ -129,9 +129,9 @@ func prettyPrintInfo(cli *Cli, info *types.SystemInfo) error {
 func infoExample() string {
 	return `$ pouch info
 Containers: 1
-Running: 1
-Paused: 0
-Stopped: 0
+ Running: 1
+ Paused: 0
+ Stopped: 0
 Images:  0
 ID:
 Name:
@@ -147,7 +147,7 @@ Kernel Version: 3.10.0-693.17.1.el7.x86_64
 Operating System:
 OSType: linux
 Architecture:
-HTTP Proxy:
+HTTP Proxy: http://127.0.0.1:5678
 HTTPS Proxy:
 Registry: https://index.docker.io/v1/
 Experimental: false

diff --git a/daemon/mgr/system.go b/daemon/mgr/system.go
@@ -86,7 +86,7 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
 		// Driver: ,
 		// DriverStatus: ,
 		// ExperimentalBuild: ,
-		// HTTPProxy: ,
+		HTTPProxy: mgr.config.ImageProxy,
 		// HTTPSProxy: ,
 		// ID: ,
 		// Images: ,