From a495a6b14348bda79dcaaad3010c93a7a7c4c90f Mon Sep 17 00:00:00 2001 From: Zou Rui <21751189@zju.edu.cn> Date: Wed, 11 Apr 2018 17:13:28 +0800 Subject: [PATCH] feature: add image proxy info in the output of 'pouch info' Signed-off-by: Zou Rui <21751189@zju.edu.cn> --- cli/info.go | 14 +++++++------- daemon/mgr/system.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/info.go b/cli/info.go index 3b1b12ea0..ee14cf2ca 100644 --- 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 index 53764f2f1..a8b78ff9a 100644 --- 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: ,