Skip to content
This repository has been archived by the owner on Mar 23, 2019. It is now read-only.

Allow for ${PWD} in settings.volumes #664

Merged
merged 1 commit into from
Jul 24, 2017
Merged

Allow for ${PWD} in settings.volumes #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Tomas Tomecek <ttomecek@redhat.com>
Fabian von Feilitzsch <fabianvf@users.noreply.github.com>
Charlie Drage <charlie@charliedrage.com>
Roderick Randolph <roderickrandolph@users.noreply.github.com>
Marcus Levine <marcusianl@gmail.com>
Will Refvem <wbrefvem@gmail.com>
Sebastien Plisson <sebastien.plisson@gmail.com>
Mike Hume <mhumeSF@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion container/docker/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def run_conductor(self, command, config, base_path, params, engine_name=None, vo

def _add_volume(vol):
volume_parts = vol.split(':')
volume_parts[0] = os.path.normpath(os.path.abspath(os.path.expanduser(volume_parts[0])))
volume_parts[0] = os.path.normpath(os.path.abspath(os.path.expanduser(os.path.expandvars(volume_parts[0]))))
volumes[volume_parts[0]] = {
'bind': volume_parts[1] if len(volume_parts) > 1 else volume_parts[0],
'mode': volume_parts[2] if len(volume_parts) > 2 else 'rw'
Expand Down