Skip to content

Devvynpm volume ro support #444

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.

Sign up for GitHub

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

Closed
devvyn wants to merge 5 commits into from
Closed

Devvynpm volume ro support #444

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3bd532
added support for Docker's '--volumes ...:ro' readonly suffix
Jul 29, 2014
146126d
added support for Docker's '--volumes ...:ro' readonly suffix
Jul 29, 2014
e3eba7c
Revert "added support for Docker's '--volumes ...:ro' readonly suffix"
Jul 29, 2014
43730e8
Revert "added support for Docker's '--volumes ...:ro' readonly suffix"
Jul 29, 2014
5ea8570
Split volume argument three ways, check for 'ro' flag at end. Default…
Aug 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions fig/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,11 @@ def start_container(self, container=None, intermediate_container=None, **overrid
if options.get('volumes', None) is not None:
for volume in options['volumes']:
if ':' in volume:
external_dir, internal_dir = volume.split(':')
volume_split = split_volume(volume)
external_dir, internal_dir = volume_split[:2]
volume_bindings[os.path.abspath(external_dir)] = {
'bind': internal_dir,
'ro': False,
'ro': len(volume_split) == 3 and volume_split[2] == 'ro',
}

privileged = options.get('privileged', False)
Expand Down Expand Up @@ -433,13 +434,16 @@ def get_container_name(container):

def split_volume(v):
"""

:param v:
If v is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
If v is of the format INTERNAL, returns (None, INTERNAL).
"""
if ':' in v:
return v.split(':', 1)
v_split = v.split(':', 2)
else:
return (None, v)
v_split = (None, v)
return v_split


def split_port(port):
Expand Down