Skip to content

Support the init flag for container spec#2386

Merged
stevvooe merged 1 commit intomoby:masterfrom
AliyunContainerService:master
Oct 4, 2017
Merged

Support the init flag for container spec#2386
stevvooe merged 1 commit intomoby:masterfrom
AliyunContainerService:master

Conversation

@denverdino
Copy link
Contributor

Signed-off-by: Li Yi [email protected]

Add the optional init flag in container spec for init feature since Docker v1.13

Refine #2350, using BoolValue for init flag

@codecov
Copy link

codecov bot commented Sep 22, 2017

Codecov Report

Merging #2386 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2386      +/-   ##
==========================================
- Coverage   60.37%   60.37%   -0.01%     
==========================================
  Files         128      128              
  Lines       26260    26266       +6     
==========================================
+ Hits        15855    15857       +2     
+ Misses       9010     9002       -8     
- Partials     1395     1407      +12

}},
},
}
expected := (*bool)(nil)
Copy link
Contributor

Choose a reason for hiding this comment

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

var expected *bool

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

api/specs.proto Outdated
// is considered unhealthy after `Retries` number of consecutive failures.
HealthConfig healthcheck = 16;

// Run a custom init inside the container, if null, use the daemon's configured settings
Copy link
Contributor

Choose a reason for hiding this comment

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

Please follow the surrounding doc style. The comment should start with the name of the field // Init ....

Also, please this field up before tty.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

api/specs.proto Outdated
// task will exit and a new task will be rescheduled elsewhere. A container
// is considered unhealthy after `Retries` number of consecutive failures.
HealthConfig healthcheck = 16;
HealthConfig healthcheck = 16;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove the trailing whitespace.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@aaronlehmann
Copy link
Collaborator

Thanks.

The only thing I think this is missing now is an update to the api.pb.txt file. I thought that was updated automatically when running make generate, but I'm not sure. Maybe @stevvooe can clarify.

@denverdino
Copy link
Contributor Author

The api.pb.txt is auto-generated, but I don't know the process for commit. Just commit it with code changes or it is periodically updated by collabrators?

@aaronlehmann
Copy link
Collaborator

It's committed with code changes.

@denverdino
Copy link
Contributor Author

Done

@stevvooe
Copy link
Contributor

LGTM

Thanks for getting this updated!

@allencloud
Copy link
Contributor

Conflict happens. Need a rebase though. @denverdino

@denverdino
Copy link
Contributor Author

@allencloud thx and rebased

@denverdino
Copy link
Contributor Author

@aaronlehmann Any comments on that? Thanks

Copy link
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

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

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants