Fix various volume bugs #1439
Merged
Fix various volume bugs #1439
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
Seems like this is pretty much ignored by Docker, so it wasn't causing any visible issues, except when a volume name was used instead of a path. Also, added integration tests. Ref docker#1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Technically we shouldn't be passing them as binds, but the daemon doesn't seem to mind. Fixes docker#1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
bfirsh
force-pushed
the
fix-various-volume-bugs
branch
from
4cde653
to
f83993d
Compare
shin-
reviewed
Feb 8, 2017
| @@ -392,7 +393,8 @@ def create_container(self, image, command=None, hostname=None, user=None, | |||
| version 1.10. Use ``host_config`` instead. | |||
| dns_opt (:py:class:`list`): Additional options to be added to the | |||
| container's ``resolv.conf`` file | |||
| volumes (str or list): | |||
| volumes (str or list): List of paths inside the container to use | |||
There was a problem hiding this comment.
I don't think str is a valid type here, is it?
There was a problem hiding this comment.
ah, nevermind, we just add it to a one-element list if it's a string. Oops!
|
|
||
|
|
||
| def _host_volume_from_bind(bind): | ||
| bits = bind.split(':') |
There was a problem hiding this comment.
This is broken in the case of Windows host paths
shin-
approved these changes
Feb 8, 2017
|
In retrospect I think we should have dropped support for the string format in 2.0. ;) Perhaps we can phase it out over a few releases... |
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.
Fixes both issues mentioned in #1380.
Technically we shouldn't be passing volumes without a host path as binds, but the daemon doesn't seem to mind.