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

bugfix: update label compatibility with alidocker #1228

Merged

Conversation

HusterWan
Copy link
Contributor

Signed-off-by: Michael Wan zirenwan@gmail.com

Ⅰ. Describe what this PR did

fix update compatibility with alidocker
alidocker update container label is []string
pouch UpdateConfig.Label is map[string]string

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Michael Wan <zirenwan@gmail.com>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/M labels Apr 26, 2018
@codecov-io
Copy link

Codecov Report

Merging #1228 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1228      +/-   ##
==========================================
- Coverage   15.44%   15.43%   -0.01%     
==========================================
  Files         171      171              
  Lines       10576    10579       +3     
==========================================
  Hits         1633     1633              
- Misses       8823     8826       +3     
  Partials      120      120
Impacted Files Coverage Δ
daemon/mgr/container.go 0% <0%> (ø) ⬆️
cli/update.go 0% <0%> (ø) ⬆️

@@ -2110,10 +2110,10 @@ definitions:
type: "array"
items:
type: "string"
Labels:
Label:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let us keep this, and update this to Labels in sometime when ok.

@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 26, 2018
@allencloud allencloud merged commit 00f4f6e into AliyunContainerService:master Apr 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants