Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: add image proxy info in 'pouch info' #1102

Merged
merged 1 commit into from
Apr 12, 2018
Merged

feature: add image proxy info in 'pouch info' #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cli/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion daemon/mgr/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
// Driver: ,
// DriverStatus: ,
// ExperimentalBuild: ,
// HTTPProxy: ,
HTTPProxy: mgr.config.ImageProxy,
// HTTPSProxy: ,
// ID: ,
// Images: ,
Expand Down