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.

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

Conversation

ZouRui89
Copy link
Contributor

@ZouRui89 ZouRui89 commented Apr 11, 2018

Signed-off-by: Zou Rui 21751189@zju.edu.cn

Ⅰ. Describe what this PR did

This pr enhance the output of 'pouch info' by adding the info of http proxy(image proxy).

Ⅱ. Does this pull request fix one issue?

fixes one part of #1096

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

start pouch like
pouchd --image-proxy=http://127.0.0.1:5678

then

$ pouch info
Containers: 1
 Running: 1
 Paused: 0
 Stopped: 0
Images:  0
ID:
Name:
Server Version: 0.3-dev
Storage Driver:
Driver Status: []
Logging Driver:
Cgroup Driver:
runc: <nil>
containerd: <nil>
Security Options: []
Kernel Version: 3.10.0-693.17.1.el7.x86_64
Operating System:
OSType: linux
Architecture:
HTTP Proxy: http://127.0.0.1:5678
HTTPS Proxy:
Registry: https://index.docker.io/v1/
Experimental: false
Debug: true
Labels: []
CPUs: 0
Total Memory: 0
Pouch Root Dir: /var/lib/pouch
LiveRestoreEnabled: false
Daemon Listen Addresses: [unix:///var/run/pouchd.sock]

Ⅴ. Special notes for reviews

apis/swagger.yml Outdated
@@ -1379,6 +1379,11 @@ definitions:
type: "string"
example:
- ["unix:///var/run/pouchd.sock", "tcp://0.0.0.0:4243"]
ImageProxy:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already has HttpProxy in SystemInfo struct.
Is it necessary for us to add an ImageProxy as well?
@Letty5411 @yyb196

@allencloud
Copy link
Collaborator

Please change this pull request ASAP, since it is quite urgent.

Signed-off-by: Zou Rui <21751189@zju.edu.cn>
@ZouRui89
Copy link
Contributor Author

Updated. PTAL @allencloud

@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 12, 2018
@allencloud allencloud merged commit 2bd68f2 into AliyunContainerService:master Apr 12, 2018
@ZouRui89 ZouRui89 deleted the info_add branch April 27, 2018 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature LGTM one maintainer or community participant agrees to merge the pull reuqest. size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants