[docker] Add support for Docker 1.8 #1831
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| self.log.debug("Opening cgroup file: %s" % stat_file) | ||
| try: | ||
| fp = open(stat_file) | ||
| return dict(map(lambda x: x.split(), fp.read().splitlines())) | ||
| with open(stat_file, 'r') as fp: |
There was a problem hiding this comment.
'r' is the default mode in open method. Nitpick, since it's specified here but not on :445.
There was a problem hiding this comment.
switched line 445 as well, it's better to be explicit :)
|
LGTM 🌵 |
Docker 1.8 adds cgroup bind mount by default ( See https://github.com/docker/docker/blob/v1.8.0/CHANGELOG.md#runtime ) Which confuses the docker check when running in a container. This is a tiny fix to make the docker check prefers mountpoint starting with “/host”.
remh
added a commit
that referenced
this pull request
Aug 13, 2015
[docker] Add support for Docker 1.8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Docker 1.8 adds cgroup bind mount by default ( See
https://github.com/docker/docker/blob/v1.8.0/CHANGELOG.md#runtime )
Which confuses the docker check when running in a container. This is a
tiny fix to make the docker check prefers mountpoint starting with
“/host”.
Also, use "with" syntax to open files.